Fixed issues with map view.