Various small improvements (smarter calling of DBPedia)