Added country name to GeoName html
Fixed conflicts