improve shortcut_uri assignment