Fix list subcommand, pt. 2