fix show on map and clean up location name