fix shortcuts and add shortcut to expand current item