Added some wildcards to some of the rule matches

Please review @mbriskar