LocationHelper verbessert