Add city_code field and fix original_id