Added ability to have world and us city gazetteers.