Add countryId to cityId