Changed from using gazetteer codes (A,L,P ...) to hierachical names
(geo.FeatureType.PopulatedPlace,....) so that vocab and gazetteer use
same scheme