Fixing map display issues when switching modes, #109