Added geocoder location logic