Topic/fix geolocation marker on back

Fixes geolocation marker showing up always when browsing back