Made the queries work with the new rdf data had to add some optional fields