make it better - fixed Locations map