common-cli: command match improvement