Fixed bugs in map display