added orMatcher
added token filters