Fixed bugs in map view