Fix parsing of optional BuildId for subcommands
Fix parsing of optional BuildId for subcommands

When there is no other arguments (only one template parameter).

xaizek/uncov,xaizek/uncov,xaizek/uncov,xaizek/uncov,xaizek/uncov