OntClassMatcher fixes