[CA-140377] [CA-140266] Fix missing and duplicate hotkeys