Fix key map resolution only checking user settings

Alone the way a few other bugs got squashed