Enable Geocoder for factual data and map
Tidy up geocode