Updated Geocode Logic