Fixed shortcut loading using separate methods to load state/actions shortcuts