still not functioning with gazetteer.