adjusted geocoding and city data