Fix keyboard layout selection mapping