Tweaked matching rules to be more inclusive