More stringent filtering of tag kinds, and fix default keymaps