fix geoloc + change context