Changes to Geoloc service and Controller