shortcuts: improvements [#80434992]