Better handling of coordinates on the map