Fixed a problem with replacing whitespace in city/country names.