Ontology schema, data, and queries fixed