Fixing router command determination to accept subcommands