Improved DBpedia property matching

Also prevented some running time errors
-