Fix gazetteer