Mitigating Variability Issues For Feature-Based Indoor Positioning