Solr Gazetteer cleanup; Inconsistent use of country code field names