Minor fixes to list selection