removed non-matchers because of different databases