improving set_cities logic for when country name not available