Fixed bug in rdf-extension, refactored dbpedia-extension