updated for city data (geocoder)