Keymap fix for tag