Make search-cmd a subcommand