Fixed geocoding issues