Geocoding improved