Tweak the regex used for cmd match