First step in fixing menus with encoded keys