[hotkey] cleanup and change sort order