fixed map other locations
Merge branch 'location_page_updates'