fixed sorting + save sorting at menu-change