list and focus handling fixes