OntologyCleanup encoding fixes