Made all subcommands consistent with current querying