Improve localisation logic/create map pin