Fix and tweak 'subcommands' action