improve shortcut performance