more updates to shortcut mapper