Various tweaks to account for Gazetteer RDF format changes