Updated the geocoding service and defaults