added country id to cities