Revised geocoding