fix bugs in map view