Improve subcommand suggestion