Fix list subcommand