minor bug fixes in custom shortcut