Fixed and updated geolocation to be on demand