Countries and Cities are being recorded incorrectly