update usage of key bindings to respect the new sort order

Fixes #4353 and #4354 

Changes previous assumptions of sort order on key bindings.