Fix list mode listing