Fixes match and trigger validators.
Merge pull request #283 from DoSomething/match-validator

Fixes match and trigger validators.