Updated the geocoding service, and default values