Changed geonames model
Changed osm model