fix key mappings for commands on mode classes