Improve dbPedia URI encoding
Add better support for commonsMedia