fixes to list mode