Fix keymap sorting