From 21318cdf3dc8a42e050d5d73ec9672e120e5e3f8 Mon Sep 17 00:00:00 2001
From: Deborah Servili <deborah.servili@gmail.com>
Date: Fri, 2 Aug 2019 16:28:32 +0200
Subject: [PATCH] fix building mistakes

---
 clusters/target-information.json | 790 ++++++++++++-------------------
 1 file changed, 302 insertions(+), 488 deletions(-)

diff --git a/clusters/target-information.json b/clusters/target-information.json
index 5c7f30b..3431c8c 100644
--- a/clusters/target-information.json
+++ b/clusters/target-information.json
@@ -40,7 +40,6 @@
         "top-level-domain": "lu",
         "type": "country"
       },
-      "top-level-domain": ".lu",
       "uuid": "f9a1d7f4-980a-11e9-a8b6-23162ddc4255",
       "value": "Luxembourg"
     },
@@ -49,13 +48,29 @@
         "calling-code": [
           "+93"
         ],
+        "capital": "Kabul",
+        "currency": [
+          "AFN",
+          "Afs",
+          "Afghani"
+        ],
         "iso-code": [
           "AF",
           "AFG"
         ],
+        "official-languages": [
+          "Dari",
+          "Pashto"
+        ],
+        "synomyms": [
+          "افغانستان",
+          "Afġānistān",
+          "Afġānestān",
+          "Islamic Republic of Afghanistan"
+        ],
+        "top-level-domain": ".af",
         "type": "country"
       },
-      "top-level-domain": ".af",
       "uuid": "2d0b4ddc-4b46-4e75-8c8b-02f4f7446507",
       "value": "Afghanistan"
     },
@@ -64,13 +79,30 @@
         "calling-code": [
           "+355"
         ],
+        "capital": "Tirana",
+        "currency": [
+          "Lek",
+          "ALL"
+        ],
         "iso-code": [
           "AL",
           "ALB"
         ],
+        "official-languages": [
+          "Albanian"
+        ],
+        "synomyms": [
+          "Shqipëri",
+          "Shqipëria",
+          "Shqipni",
+          "Shqipnia",
+          "Shqypni",
+          "Shqypnia",
+          "Republic of Albania"
+        ],
+        "top-level-domain": ".al",
         "type": "country"
       },
-      "top-level-domain": ".al",
       "uuid": "bc4c6bf6-c5f1-4927-b928-e9e2434e9ec4",
       "value": "Albania"
     },
@@ -79,13 +111,29 @@
         "calling-code": [
           "+213"
         ],
+        "capital": "Algiers",
+        "currency": [
+          "Dinar",
+          "DZD"
+        ],
         "iso-code": [
           "DZ",
           "DZA"
         ],
+        "official-languages": [
+          "Arabic",
+          "Berbe["
+        ],
+        "synomyms": [
+          "الجزائر‎",
+          "al-Jazāʾir",
+          "الدزاير‎",
+          "al-dzāyīr",
+          "People's Democratic Republic of Algeria"
+        ],
+        "top-level-domain": ".dz",
         "type": "country"
       },
-      "top-level-domain": ".dz",
       "uuid": "13612aed-8efb-444f-8e29-5b93bd821d0e",
       "value": "Algeria"
     },
@@ -94,11 +142,25 @@
         "calling-code": [
           "+1-684"
         ],
+        "capital": "Pago Pago",
+        "currency": [
+          "United States dollar",
+          "USD"
+        ],
         "iso-code": [
           "AS",
           "ASM"
         ],
-        "type": "country"
+        "official-languages": [
+          "English",
+          "Samoan"
+        ],
+        "synomyms": [
+          "Amerika Sāmoa",
+          "Amelika Sāmoa",
+          "Sāmoa Amelika"
+        ],
+        "type": "unincorporated territory"
       },
       "uuid": "9856b948-5662-4ce3-beef-9a777e758e5c",
       "value": "American Samoa"
@@ -112,9 +174,8 @@
           "AD",
           "AND"
         ],
-        "type": "country"
+        "top-level-domain": ".ad"
       },
-      "top-level-domain": ".ad",
       "uuid": "5f8aeaac-8654-4b12-99c6-d3bf5ba43c7a",
       "value": "Andorra"
     },
@@ -127,9 +188,8 @@
           "AO",
           "AGO"
         ],
-        "type": "country"
+        "top-level-domain": ".ao"
       },
-      "top-level-domain": ".ao",
       "uuid": "ec22a747-be01-4bf8-bb3b-4dac8ec033dc",
       "value": "Angola"
     },
@@ -142,9 +202,8 @@
           "AI",
           "AIA"
         ],
-        "type": "country"
+        "top-level-domain": ".ai"
       },
-      "top-level-domain": ".ai",
       "uuid": "eaeca984-4c51-4bff-8389-4b66c8fddb1c",
       "value": "Anguilla"
     },
@@ -157,9 +216,8 @@
           "AQ",
           "ATA"
         ],
-        "type": "country"
+        "top-level-domain": ".aq"
       },
-      "top-level-domain": ".aq",
       "uuid": "09dbf944-5c73-4ff7-8b1b-b43b42282acb",
       "value": "Antarctica"
     },
@@ -172,9 +230,8 @@
           "AG",
           "ATG"
         ],
-        "type": "country"
+        "top-level-domain": ".ag"
       },
-      "top-level-domain": ".ag",
       "uuid": "b0d7f6d5-8f5e-4bd8-98d7-92fcc4c195b9",
       "value": "Antigua and Barbuda"
     },
@@ -187,9 +244,8 @@
           "AR",
           "ARG"
         ],
-        "type": "country"
+        "top-level-domain": ".ar"
       },
-      "top-level-domain": ".ar",
       "uuid": "f21ecd23-c3c8-4308-8363-c1260a57e695",
       "value": "Argentina"
     },
@@ -202,9 +258,8 @@
           "AM",
           "ARM"
         ],
-        "type": "country"
+        "top-level-domain": ".am"
       },
-      "top-level-domain": ".am",
       "uuid": "e1a61736-a7d4-4c31-aeda-bd49beabdb40",
       "value": "Armenia"
     },
@@ -216,8 +271,7 @@
         "iso-code": [
           "AW",
           "ABW"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "d9684c43-0ced-48eb-86e6-d2802ff31cde",
       "value": "Aruba"
@@ -231,9 +285,8 @@
           "AU",
           "AUS"
         ],
-        "type": "country"
+        "top-level-domain": ".au"
       },
-      "top-level-domain": ".au",
       "uuid": "ca250c03-aead-41e3-a077-085d66211186",
       "value": "Australia"
     },
@@ -246,9 +299,8 @@
           "AT",
           "AUT"
         ],
-        "type": "country"
+        "top-level-domain": ".at"
       },
-      "top-level-domain": ".at",
       "uuid": "e88f7003-09e9-4275-b176-d4246e59a0d5",
       "value": "Austria"
     },
@@ -261,9 +313,8 @@
           "AZ",
           "AZE"
         ],
-        "type": "country"
+        "top-level-domain": ".az"
       },
-      "top-level-domain": ".az",
       "uuid": "4dac6eec-948d-4df5-946b-21ac0aaf5471",
       "value": "Azerbaijan"
     },
@@ -276,9 +327,8 @@
           "BS",
           "BHS"
         ],
-        "type": "country"
+        "top-level-domain": ".bs"
       },
-      "top-level-domain": ".bs",
       "uuid": "5029a486-9c17-454a-bbcd-6e9b774705f9",
       "value": "Bahamas"
     },
@@ -291,9 +341,8 @@
           "BH",
           "BHR"
         ],
-        "type": "country"
+        "top-level-domain": ".bh"
       },
-      "top-level-domain": ".bh",
       "uuid": "819805c9-8f06-4f0c-af79-926960b4c23f",
       "value": "Bahrain"
     },
@@ -306,9 +355,8 @@
           "BD",
           "BGD"
         ],
-        "type": "country"
+        "top-level-domain": ".bd"
       },
-      "top-level-domain": ".bd",
       "uuid": "cb78009e-1355-4afa-a655-0cf03d7fd947",
       "value": "Bangladesh"
     },
@@ -321,9 +369,8 @@
           "BB",
           "BRB"
         ],
-        "type": "country"
+        "top-level-domain": ".bb"
       },
-      "top-level-domain": ".bb",
       "uuid": "062daa09-7c4a-4dec-ba9d-625d96871708",
       "value": "Barbados"
     },
@@ -336,9 +383,8 @@
           "BY",
           "BLR"
         ],
-        "type": "country"
+        "top-level-domain": ".by"
       },
-      "top-level-domain": ".by",
       "uuid": "9e5e118a-ebe8-464a-bd38-350af4d645c4",
       "value": "Belarus"
     },
@@ -351,9 +397,8 @@
           "BE",
           "BEL"
         ],
-        "type": "country"
+        "top-level-domain": ".be"
       },
-      "top-level-domain": ".be",
       "uuid": "30f35478-7961-464f-bd3c-732a8f5e1fe5",
       "value": "Belgium"
     },
@@ -366,9 +411,8 @@
           "BZ",
           "BLZ"
         ],
-        "type": "country"
+        "top-level-domain": ".bz"
       },
-      "top-level-domain": ".bz",
       "uuid": "4b7f2038-cc17-4bb1-bc28-dacc9772e6fc",
       "value": "Belize"
     },
@@ -381,9 +425,8 @@
           "BJ",
           "BEN"
         ],
-        "type": "country"
+        "top-level-domain": ".bj"
       },
-      "top-level-domain": ".bj",
       "uuid": "5c68d3ce-0beb-4b9a-a81d-e5d64f14b9a1",
       "value": "Benin"
     },
@@ -396,9 +439,8 @@
           "BM",
           "BMU"
         ],
-        "type": "country"
+        "top-level-domain": ".bm"
       },
-      "top-level-domain": ".bm",
       "uuid": "67e9dd29-9da1-4585-b0e6-303defa1e751",
       "value": "Bermuda"
     },
@@ -411,9 +453,8 @@
           "BT",
           "BTN"
         ],
-        "type": "country"
+        "top-level-domain": ".bt"
       },
-      "top-level-domain": ".bt",
       "uuid": "7a431a2e-623b-4fb0-8316-a5d42266070d",
       "value": "Bhutan"
     },
@@ -426,9 +467,8 @@
           "BO",
           "BOL"
         ],
-        "type": "country"
+        "top-level-domain": ".bo"
       },
-      "top-level-domain": ".bo",
       "uuid": "06c20eb8-bec1-4f56-a5af-91f5fb826e4d",
       "value": "Bolivia"
     },
@@ -441,9 +481,8 @@
           "BA",
           "BIH"
         ],
-        "type": "country"
+        "top-level-domain": ".ba"
       },
-      "top-level-domain": ".ba",
       "uuid": "eccea7a8-d7f5-4b33-b948-ac8595e92500",
       "value": "Bosnia and Herzegovina"
     },
@@ -456,9 +495,8 @@
           "BW",
           "BWA"
         ],
-        "type": "country"
+        "top-level-domain": ".bw"
       },
-      "top-level-domain": ".bw",
       "uuid": "b29dca55-6930-494e-ae8e-fe89e5317529",
       "value": "Botswana"
     },
@@ -471,9 +509,8 @@
           "BR",
           "BRA"
         ],
-        "type": "country"
+        "top-level-domain": ".br"
       },
-      "top-level-domain": ".br",
       "uuid": "75fe4c94-f864-41dc-8dd2-758e2e2d4deb",
       "value": "Brazil"
     },
@@ -486,9 +523,8 @@
           "IO",
           "IOT"
         ],
-        "type": "country"
+        "top-level-domain": ".io"
       },
-      "top-level-domain": ".io",
       "uuid": "f974dd18-3a6b-4910-af8f-1d6256369b05",
       "value": "British Indian Ocean Territory"
     },
@@ -501,9 +537,8 @@
           "VG",
           "VGB"
         ],
-        "type": "country"
+        "top-level-domain": ".vg"
       },
-      "top-level-domain": ".vg",
       "uuid": "9feffe01-624f-46fd-9e55-baec2098db69",
       "value": "British Virgin Islands"
     },
@@ -516,9 +551,8 @@
           "BN",
           "BRN"
         ],
-        "type": "country"
+        "top-level-domain": ".bn"
       },
-      "top-level-domain": ".bn",
       "uuid": "a039c8f7-1a7a-46e6-b16b-a9648a280f77",
       "value": "Brunei"
     },
@@ -531,9 +565,8 @@
           "BG",
           "BGR"
         ],
-        "type": "country"
+        "top-level-domain": ".bg"
       },
-      "top-level-domain": ".bg",
       "uuid": "61766ec7-b1aa-4d92-afaa-883842d4f6ac",
       "value": "Bulgaria"
     },
@@ -546,9 +579,8 @@
           "BF",
           "BFA"
         ],
-        "type": "country"
+        "top-level-domain": ".bf"
       },
-      "top-level-domain": ".bf",
       "uuid": "dfb27e34-f6dc-4db3-b3fa-313a8125ddf2",
       "value": "Burkina Faso"
     },
@@ -561,9 +593,8 @@
           "BI",
           "BDI"
         ],
-        "type": "country"
+        "top-level-domain": ".bi"
       },
-      "top-level-domain": ".bi",
       "uuid": "f545307d-db22-49d3-858f-8d03db4428da",
       "value": "Burundi"
     },
@@ -576,9 +607,8 @@
           "KH",
           "KHM"
         ],
-        "type": "country"
+        "top-level-domain": ".kh"
       },
-      "top-level-domain": ".kh",
       "uuid": "03757eb3-f75a-48e1-a4ef-18a62c7d1838",
       "value": "Cambodia"
     },
@@ -591,9 +621,8 @@
           "CM",
           "CMR"
         ],
-        "type": "country"
+        "top-level-domain": ".cm"
       },
-      "top-level-domain": ".cm",
       "uuid": "68e9ed03-4954-4a2a-8971-1224fa3ab760",
       "value": "Cameroon"
     },
@@ -606,9 +635,8 @@
           "CA",
           "CAN"
         ],
-        "type": "country"
+        "top-level-domain": ".ca"
       },
-      "top-level-domain": ".ca",
       "uuid": "d0e51f88-2a01-4a9d-b080-464bb6f5172f",
       "value": "Canada"
     },
@@ -621,9 +649,8 @@
           "CV",
           "CPV"
         ],
-        "type": "country"
+        "top-level-domain": ".cv"
       },
-      "top-level-domain": ".cv",
       "uuid": "457e880a-0d5a-4729-b7b1-fcfeccf61f07",
       "value": "Cape Verde"
     },
@@ -636,9 +663,8 @@
           "KY",
           "CYM"
         ],
-        "type": "country"
+        "top-level-domain": ".ky"
       },
-      "top-level-domain": ".ky",
       "uuid": "036ac306-bedd-44a6-807a-69314d59dfef",
       "value": "Cayman Islands"
     },
@@ -651,9 +677,8 @@
           "CF",
           "CAF"
         ],
-        "type": "country"
+        "top-level-domain": ".cf"
       },
-      "top-level-domain": ".cf",
       "uuid": "4abded58-faa1-4a2b-ae16-01a12409df7c",
       "value": "Central African Republic"
     },
@@ -666,9 +691,8 @@
           "TD",
           "TCD"
         ],
-        "type": "country"
+        "top-level-domain": ".td"
       },
-      "top-level-domain": ".td",
       "uuid": "da6f9a8b-91f0-400f-ad1b-47b49fe48412",
       "value": "Chad"
     },
@@ -681,9 +705,8 @@
           "CL",
           "CHL"
         ],
-        "type": "country"
+        "top-level-domain": ".cl"
       },
-      "top-level-domain": ".cl",
       "uuid": "bb81858f-5803-4f3b-9aac-92869b750f9e",
       "value": "Chile"
     },
@@ -695,8 +718,7 @@
         "iso-code": [
           "CN",
           "CHN"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "53d3d205-db31-4ec9-86aa-c2bf11fd18e6",
       "value": "China"
@@ -710,9 +732,8 @@
           "CX",
           "CXR"
         ],
-        "type": "country"
+        "top-level-domain": ".cx"
       },
-      "top-level-domain": ".cx",
       "uuid": "0ccf619a-927a-4963-9ec3-34598e898d46",
       "value": "Christmas Island"
     },
@@ -724,8 +745,7 @@
         "iso-code": [
           "CC",
           "CCK"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "a5752a1e-1306-4a6c-8ed4-c9d0f627d397",
       "value": "Cocos Islands"
@@ -739,9 +759,8 @@
           "CO",
           "COL"
         ],
-        "type": "country"
+        "top-level-domain": ".co"
       },
-      "top-level-domain": ".co",
       "uuid": "25f47423-5005-4caa-b4b0-6b9ada986611",
       "value": "Colombia"
     },
@@ -754,9 +773,8 @@
           "KM",
           "COM"
         ],
-        "type": "country"
+        "top-level-domain": ".km"
       },
-      "top-level-domain": ".km",
       "uuid": "3a9ec602-9f36-4943-baee-f873ee3c3691",
       "value": "Comoros"
     },
@@ -769,9 +787,8 @@
           "CK",
           "COK"
         ],
-        "type": "country"
+        "top-level-domain": ".ck"
       },
-      "top-level-domain": ".ck",
       "uuid": "704756d4-9e33-48c3-8d25-037b00e94888",
       "value": "Cook Islands"
     },
@@ -784,9 +801,8 @@
           "CR",
           "CRI"
         ],
-        "type": "country"
+        "top-level-domain": ".cr"
       },
-      "top-level-domain": ".cr",
       "uuid": "a568be65-88ff-4290-9562-9a5227eb346a",
       "value": "Costa Rica"
     },
@@ -799,9 +815,8 @@
           "HR",
           "HRV"
         ],
-        "type": "country"
+        "top-level-domain": ".hr"
       },
-      "top-level-domain": ".hr",
       "uuid": "c753504c-9fe3-41f3-a423-86f64eff2af4",
       "value": "Croatia"
     },
@@ -814,9 +829,8 @@
           "CU",
           "CUB"
         ],
-        "type": "country"
+        "top-level-domain": ".cu"
       },
-      "top-level-domain": ".cu",
       "uuid": "7abd8189-65d8-4682-8091-7350d8e8ea9f",
       "value": "Cuba"
     },
@@ -828,8 +842,7 @@
         "iso-code": [
           "CW",
           "CUW"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "2f8fc176-c26d-48a9-a441-2f0e7b04e74b",
       "value": "Curacao"
@@ -843,9 +856,8 @@
           "CY",
           "CYP"
         ],
-        "type": "country"
+        "top-level-domain": ".cy"
       },
-      "top-level-domain": ".cy",
       "uuid": "95e86a29-0ee0-4ac5-8ec0-57036298c141",
       "value": "Cyprus"
     },
@@ -858,9 +870,8 @@
           "CZ",
           "CZE"
         ],
-        "type": "country"
+        "top-level-domain": ".cz"
       },
-      "top-level-domain": ".cz",
       "uuid": "ef6651eb-1168-422c-9853-5200c737b332",
       "value": "Czech Republic"
     },
@@ -873,9 +884,8 @@
           "CD",
           "COD"
         ],
-        "type": "country"
+        "top-level-domain": ".cd"
       },
-      "top-level-domain": ".cd",
       "uuid": "5a266a76-fc45-4457-8838-3e490bd26dc1",
       "value": "Democratic Republic of the Congo"
     },
@@ -888,9 +898,8 @@
           "DK",
           "DNK"
         ],
-        "type": "country"
+        "top-level-domain": ".dk"
       },
-      "top-level-domain": ".dk",
       "uuid": "2890ae27-cc54-42df-8c0c-47285145bd49",
       "value": "Denmark"
     },
@@ -903,9 +912,8 @@
           "DJ",
           "DJI"
         ],
-        "type": "country"
+        "top-level-domain": ".dj"
       },
-      "top-level-domain": ".dj",
       "uuid": "543afec2-19b2-4769-aacb-dd69a380c2cc",
       "value": "Djibouti"
     },
@@ -918,9 +926,8 @@
           "DM",
           "DMA"
         ],
-        "type": "country"
+        "top-level-domain": ".dm"
       },
-      "top-level-domain": ".dm",
       "uuid": "151ff291-da46-41aa-b8c2-62faecefbe4a",
       "value": "Dominica"
     },
@@ -935,9 +942,8 @@
           "DO",
           "DOM"
         ],
-        "type": "country"
+        "top-level-domain": ".do"
       },
-      "top-level-domain": ".do",
       "uuid": "a621624f-5c1a-403d-b5dd-89da7af7555f",
       "value": "Dominican Republic"
     },
@@ -950,9 +956,8 @@
           "TL",
           "TLS"
         ],
-        "type": "country"
+        "top-level-domain": ".tl"
       },
-      "top-level-domain": ".tl",
       "uuid": "b5371e8a-00bb-4653-abe3-2e9b92454b15",
       "value": "East Timor"
     },
@@ -965,9 +970,8 @@
           "EC",
           "ECU"
         ],
-        "type": "country"
+        "top-level-domain": ".ec"
       },
-      "top-level-domain": ".ec",
       "uuid": "9e4f2bc9-9ef5-4369-a275-b3df56e5a35e",
       "value": "Ecuador"
     },
@@ -980,9 +984,8 @@
           "EG",
           "EGY"
         ],
-        "type": "country"
+        "top-level-domain": ".eg"
       },
-      "top-level-domain": ".eg",
       "uuid": "7fbebdc8-5a13-430e-9248-58d2b1a9af0f",
       "value": "Egypt"
     },
@@ -995,9 +998,8 @@
           "SV",
           "SLV"
         ],
-        "type": "country"
+        "top-level-domain": ".sv"
       },
-      "top-level-domain": ".sv",
       "uuid": "1822e12a-1f4b-4675-8e2a-a6d123b3ea24",
       "value": "El Salvador"
     },
@@ -1010,9 +1012,8 @@
           "GQ",
           "GNQ"
         ],
-        "type": "country"
+        "top-level-domain": ".gq"
       },
-      "top-level-domain": ".gq",
       "uuid": "5c3d7a8e-9cd6-4d3d-ab6b-3cb8acaa208f",
       "value": "Equatorial Guinea"
     },
@@ -1024,8 +1025,7 @@
         "iso-code": [
           "ER",
           "ERI"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "aea99d00-9675-4289-9f3b-acb1ddf13f49",
       "value": "Eritrea"
@@ -1039,9 +1039,8 @@
           "EE",
           "EST"
         ],
-        "type": "country"
+        "top-level-domain": ".ee"
       },
-      "top-level-domain": ".ee",
       "uuid": "c8ea4824-7ed2-473a-906d-745bd73a2612",
       "value": "Estonia"
     },
@@ -1054,9 +1053,8 @@
           "ET",
           "ETH"
         ],
-        "type": "country"
+        "top-level-domain": ".et"
       },
-      "top-level-domain": ".et",
       "uuid": "b25e700a-6b79-4c86-90ff-304032b182db",
       "value": "Ethiopia"
     },
@@ -1069,9 +1067,8 @@
           "FK",
           "FLK"
         ],
-        "type": "country"
+        "top-level-domain": ".fk"
       },
-      "top-level-domain": ".fk",
       "uuid": "8041a1dc-e9a6-460e-8dd8-d37e45b787dd",
       "value": "Falkland Islands"
     },
@@ -1083,8 +1080,7 @@
         "iso-code": [
           "FO",
           "FRO"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "3aa1d642-9b8d-4dcd-bd4a-5368602555a4",
       "value": "Faroe Islands"
@@ -1098,9 +1094,8 @@
           "FJ",
           "FJI"
         ],
-        "type": "country"
+        "top-level-domain": ".fj"
       },
-      "top-level-domain": ".fj",
       "uuid": "218bcbfe-46cb-4fd0-852c-3a7fc64a2908",
       "value": "Fiji"
     },
@@ -1113,9 +1108,8 @@
           "FI",
           "FIN"
         ],
-        "type": "country"
+        "top-level-domain": ".fi"
       },
-      "top-level-domain": ".fi",
       "uuid": "bde60aea-b748-4bd9-8d6d-f0174af0b36e",
       "value": "Finland"
     },
@@ -1128,9 +1122,8 @@
           "FR",
           "FRA"
         ],
-        "type": "country"
+        "top-level-domain": ".fr"
       },
-      "top-level-domain": ".fr",
       "uuid": "0cc6ad08-fac6-42bc-a7c7-09a53ea6b968",
       "value": "France"
     },
@@ -1142,8 +1135,7 @@
         "iso-code": [
           "PF",
           "PYF"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "df751036-8c01-41ce-ab02-139119ce9213",
       "value": "French Polynesia"
@@ -1157,9 +1149,8 @@
           "GA",
           "GAB"
         ],
-        "type": "country"
+        "top-level-domain": ".ga"
       },
-      "top-level-domain": ".ga",
       "uuid": "8e70d742-c708-4a9e-8ab1-6a8a90306ccf",
       "value": "Gabon"
     },
@@ -1171,8 +1162,7 @@
         "iso-code": [
           "GM",
           "GMB"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "2ded2689-16c3-4476-a2d8-04c4bc51ae4a",
       "value": "Gambia"
@@ -1186,9 +1176,8 @@
           "GE",
           "GEO"
         ],
-        "type": "country"
+        "top-level-domain": ".ge"
       },
-      "top-level-domain": ".ge",
       "uuid": "76c2f2fe-ce68-4008-aa30-1ac8de38d617",
       "value": "Georgia"
     },
@@ -1201,9 +1190,8 @@
           "DE",
           "DEU"
         ],
-        "type": "country"
+        "top-level-domain": ".de"
       },
-      "top-level-domain": ".de",
       "uuid": "4121d334-39d0-49c4-8a0e-0442c6bdcbc4",
       "value": "Germany"
     },
@@ -1216,9 +1204,8 @@
           "GH",
           "GHA"
         ],
-        "type": "country"
+        "top-level-domain": ".gh"
       },
-      "top-level-domain": ".gh",
       "uuid": "6f7a0f04-8299-4a2d-95d0-a8305a1ae23e",
       "value": "Ghana"
     },
@@ -1230,8 +1217,7 @@
         "iso-code": [
           "GI",
           "GIB"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "078a914d-7ef3-413b-8a62-2473b8db1c12",
       "value": "Gibraltar"
@@ -1245,9 +1231,8 @@
           "GR",
           "GRC"
         ],
-        "type": "country"
+        "top-level-domain": ".gr"
       },
-      "top-level-domain": ".gr",
       "uuid": "505730f7-2637-4efb-845d-f1af7cdca109",
       "value": "Greece"
     },
@@ -1259,8 +1244,7 @@
         "iso-code": [
           "GL",
           "GRL"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "20f2c544-093d-4964-84ae-7d5fd54ad6d0",
       "value": "Greenland"
@@ -1274,9 +1258,8 @@
           "GD",
           "GRD"
         ],
-        "type": "country"
+        "top-level-domain": ".gd"
       },
-      "top-level-domain": ".gd",
       "uuid": "1aea4486-eef7-496b-9a69-a2d2bdbe7b77",
       "value": "Grenada"
     },
@@ -1288,8 +1271,7 @@
         "iso-code": [
           "GU",
           "GUM"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "4dc24d07-79ee-43b7-98a0-53bc79a29708",
       "value": "Guam"
@@ -1303,9 +1285,8 @@
           "GT",
           "GTM"
         ],
-        "type": "country"
+        "top-level-domain": ".gt"
       },
-      "top-level-domain": ".gt",
       "uuid": "3e3e89d2-07f3-4ddc-addf-2d5cb05bedd1",
       "value": "Guatemala"
     },
@@ -1317,8 +1298,7 @@
         "iso-code": [
           "GG",
           "GGY"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "dd42b40e-2740-46f5-9bb1-6d0799a081c7",
       "value": "Guernsey"
@@ -1332,9 +1312,8 @@
           "GN",
           "GIN"
         ],
-        "type": "country"
+        "top-level-domain": ".gn"
       },
-      "top-level-domain": ".gn",
       "uuid": "f227edf8-e538-45b8-8a70-1a05ea5a605b",
       "value": "Guinea"
     },
@@ -1347,9 +1326,8 @@
           "GW",
           "GNB"
         ],
-        "type": "country"
+        "top-level-domain": ".gw"
       },
-      "top-level-domain": ".gw",
       "uuid": "3b5824bc-936e-4403-bdc9-4dd9a7db36e3",
       "value": "Guinea-Bissau"
     },
@@ -1362,9 +1340,8 @@
           "GY",
           "GUY"
         ],
-        "type": "country"
+        "top-level-domain": ".gy"
       },
-      "top-level-domain": ".gy",
       "uuid": "cb9fbca4-6cc6-4f83-9ebc-4e975cddea69",
       "value": "Guyana"
     },
@@ -1377,9 +1354,8 @@
           "HT",
           "HTI"
         ],
-        "type": "country"
+        "top-level-domain": ".ht"
       },
-      "top-level-domain": ".ht",
       "uuid": "595dd000-64ac-43b5-be17-0f52eff47459",
       "value": "Haiti"
     },
@@ -1392,9 +1368,8 @@
           "HN",
           "HND"
         ],
-        "type": "country"
+        "top-level-domain": ".hn"
       },
-      "top-level-domain": ".hn",
       "uuid": "74a66006-ce2b-4280-abd1-e6f14ff9b926",
       "value": "Honduras"
     },
@@ -1407,9 +1382,8 @@
           "HK",
           "HKG"
         ],
-        "type": "country"
+        "top-level-domain": ".hk"
       },
-      "top-level-domain": ".hk",
       "uuid": "51c8ffc5-5453-4bf8-b100-74186d9a0de0",
       "value": "Hong Kong"
     },
@@ -1422,9 +1396,8 @@
           "HU",
           "HUN"
         ],
-        "type": "country"
+        "top-level-domain": ".hu"
       },
-      "top-level-domain": ".hu",
       "uuid": "adc52cee-5668-498d-8111-db1c38a584c5",
       "value": "Hungary"
     },
@@ -1437,9 +1410,8 @@
           "IS",
           "ISL"
         ],
-        "type": "country"
+        "top-level-domain": ".is"
       },
-      "top-level-domain": ".is",
       "uuid": "5bcfbed4-d9af-40ab-bcbd-013cad252570",
       "value": "Iceland"
     },
@@ -1452,9 +1424,8 @@
           "IN",
           "IND"
         ],
-        "type": "country"
+        "top-level-domain": ".in"
       },
-      "top-level-domain": ".in",
       "uuid": "283a7b58-9fa6-48c8-95bc-9ece77b5b2ea",
       "value": "India"
     },
@@ -1467,9 +1438,8 @@
           "ID",
           "IDN"
         ],
-        "type": "country"
+        "top-level-domain": ".id"
       },
-      "top-level-domain": ".id",
       "uuid": "417b5c63-a388-45d1-b104-cede98b13fe0",
       "value": "Indonesia"
     },
@@ -1482,9 +1452,8 @@
           "IR",
           "IRN"
         ],
-        "type": "country"
+        "top-level-domain": ".ir"
       },
-      "top-level-domain": ".ir",
       "uuid": "12b32332-ead1-4f69-be61-69ab1ed27d01",
       "value": "Iran"
     },
@@ -1497,9 +1466,8 @@
           "IQ",
           "IRQ"
         ],
-        "type": "country"
+        "top-level-domain": ".iq"
       },
-      "top-level-domain": ".iq",
       "uuid": "625f37bd-fe48-4791-ac1e-be8d069643a1",
       "value": "Iraq"
     },
@@ -1512,9 +1480,8 @@
           "IE",
           "IRL"
         ],
-        "type": "country"
+        "top-level-domain": ".ie"
       },
-      "top-level-domain": ".ie",
       "uuid": "b1243ef1-78f4-4e10-841d-bc61361f21f8",
       "value": "Ireland"
     },
@@ -1526,8 +1493,7 @@
         "iso-code": [
           "IM",
           "IMN"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "57855966-b290-47e2-b098-1d903f4163b8",
       "value": "Isle of Man"
@@ -1541,9 +1507,8 @@
           "IL",
           "ISR"
         ],
-        "type": "country"
+        "top-level-domain": ".il"
       },
-      "top-level-domain": ".il",
       "uuid": "3273414a-8331-44cc-b3f6-890bf2363607",
       "value": "Israel"
     },
@@ -1556,9 +1521,8 @@
           "IT",
           "ITA"
         ],
-        "type": "country"
+        "top-level-domain": ".it"
       },
-      "top-level-domain": ".it",
       "uuid": "1bcc0b11-d906-40ea-910c-a1124c4d82bd",
       "value": "Italy"
     },
@@ -1571,9 +1535,8 @@
           "CI",
           "CIV"
         ],
-        "type": "country"
+        "top-level-domain": ".ci"
       },
-      "top-level-domain": ".ci",
       "uuid": "c1aac71f-b060-4816-9369-451df1550883",
       "value": "Ivory Coast"
     },
@@ -1586,9 +1549,8 @@
           "JM",
           "JAM"
         ],
-        "type": "country"
+        "top-level-domain": ".jm"
       },
-      "top-level-domain": ".jm",
       "uuid": "f5a606a6-80c4-4349-af9b-1450e6699868",
       "value": "Jamaica"
     },
@@ -1601,9 +1563,8 @@
           "JP",
           "JPN"
         ],
-        "type": "country"
+        "top-level-domain": ".jp"
       },
-      "top-level-domain": ".jp",
       "uuid": "98ee5301-46da-4754-963f-8cf9aa17f7fa",
       "value": "Japan"
     },
@@ -1615,8 +1576,7 @@
         "iso-code": [
           "JE",
           "JEY"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "2d2423ff-f5e1-4f2b-897e-da0aff79836f",
       "value": "Jersey"
@@ -1630,9 +1590,8 @@
           "JO",
           "JOR"
         ],
-        "type": "country"
+        "top-level-domain": ".jo"
       },
-      "top-level-domain": ".jo",
       "uuid": "f68750ae-d159-427e-bc6b-536fb676b8bf",
       "value": "Jordan"
     },
@@ -1645,9 +1604,8 @@
           "KZ",
           "KAZ"
         ],
-        "type": "country"
+        "top-level-domain": ".kz"
       },
-      "top-level-domain": ".kz",
       "uuid": "fc54834e-2131-47c5-b470-974855757469",
       "value": "Kazakhstan"
     },
@@ -1660,9 +1618,8 @@
           "KE",
           "KEN"
         ],
-        "type": "country"
+        "top-level-domain": ".ke"
       },
-      "top-level-domain": ".ke",
       "uuid": "60828537-e2d4-4f1c-b347-2c82901e9f01",
       "value": "Kenya"
     },
@@ -1675,9 +1632,8 @@
           "KI",
           "KIR"
         ],
-        "type": "country"
+        "top-level-domain": ".ki"
       },
-      "top-level-domain": ".ki",
       "uuid": "7a51098b-34bd-4f86-a478-90c8c20a7fb7",
       "value": "Kiribati"
     },
@@ -1689,8 +1645,7 @@
         "iso-code": [
           "XK",
           "XKX"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "f7881f1c-647c-4a6e-9dc6-d5906832f978",
       "value": "Kosovo"
@@ -1704,9 +1659,8 @@
           "KW",
           "KWT"
         ],
-        "type": "country"
+        "top-level-domain": ".kw"
       },
-      "top-level-domain": ".kw",
       "uuid": "fbc205b4-0a7a-40db-8bf4-fe8e83357eea",
       "value": "Kuwait"
     },
@@ -1719,9 +1673,8 @@
           "KG",
           "KGZ"
         ],
-        "type": "country"
+        "top-level-domain": ".kg"
       },
-      "top-level-domain": ".kg",
       "uuid": "92d31c81-c7e9-4ac5-bc73-6ea76ed19ce3",
       "value": "Kyrgyzstan"
     },
@@ -1734,9 +1687,8 @@
           "LA",
           "LAO"
         ],
-        "type": "country"
+        "top-level-domain": ".la"
       },
-      "top-level-domain": ".la",
       "uuid": "54866dbe-1be0-4185-87e1-ed565d6d13ee",
       "value": "Laos"
     },
@@ -1749,9 +1701,8 @@
           "LV",
           "LVA"
         ],
-        "type": "country"
+        "top-level-domain": ".lv"
       },
-      "top-level-domain": ".lv",
       "uuid": "367122b1-2645-49a9-b871-23a9c74d430e",
       "value": "Latvia"
     },
@@ -1764,9 +1715,8 @@
           "LB",
           "LBN"
         ],
-        "type": "country"
+        "top-level-domain": ".lb"
       },
-      "top-level-domain": ".lb",
       "uuid": "7b7ed6de-7692-41ba-8f25-8456dda5b907",
       "value": "Lebanon"
     },
@@ -1779,9 +1729,8 @@
           "LS",
           "LSO"
         ],
-        "type": "country"
+        "top-level-domain": ".ls"
       },
-      "top-level-domain": ".ls",
       "uuid": "666ac9e5-bb2d-4317-8ad7-e92e5895f476",
       "value": "Lesotho"
     },
@@ -1794,9 +1743,8 @@
           "LR",
           "LBR"
         ],
-        "type": "country"
+        "top-level-domain": ".lr"
       },
-      "top-level-domain": ".lr",
       "uuid": "fad73876-fff0-4794-b970-c02d98ac2889",
       "value": "Liberia"
     },
@@ -1809,9 +1757,8 @@
           "LY",
           "LBY"
         ],
-        "type": "country"
+        "top-level-domain": ".ly"
       },
-      "top-level-domain": ".ly",
       "uuid": "98cae8b3-c6cc-4434-ad7a-0b424e7b38a5",
       "value": "Libya"
     },
@@ -1824,9 +1771,8 @@
           "LI",
           "LIE"
         ],
-        "type": "country"
+        "top-level-domain": ".li"
       },
-      "top-level-domain": ".li",
       "uuid": "7359fcca-a4a2-4e8a-915f-a080f6b2e7b6",
       "value": "Liechtenstein"
     },
@@ -1839,25 +1785,11 @@
           "LT",
           "LTU"
         ],
-        "type": "country"
+        "top-level-domain": ".lt"
       },
-      "top-level-domain": ".lt",
       "uuid": "f32136ed-0727-4842-a9b7-9ea8f5d6f3fe",
       "value": "Lithuania"
     },
-    {
-      "meta": {
-        "calling-code": [
-          "+"
-        ],
-        "iso-code": [
-          ""
-        ],
-        "type": "country"
-      },
-      "uuid": "bda2a531-3fc7-4a68-8a50-0f9f6d003c05",
-      "value": ""
-    },
     {
       "meta": {
         "calling-code": [
@@ -1867,9 +1799,8 @@
           "MO",
           "MAC"
         ],
-        "type": "country"
+        "top-level-domain": ".mo"
       },
-      "top-level-domain": ".mo",
       "uuid": "edf25443-9d01-45e5-af67-4943746a06d8",
       "value": "Macau"
     },
@@ -1881,8 +1812,7 @@
         "iso-code": [
           "MK",
           "MKD"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "cbb86f5b-f390-489b-9c59-5f16d3db2cb6",
       "value": "Macedonia"
@@ -1896,9 +1826,8 @@
           "MG",
           "MDG"
         ],
-        "type": "country"
+        "top-level-domain": ".mg"
       },
-      "top-level-domain": ".mg",
       "uuid": "940cb63e-5e76-4494-a6f7-b976df4837a2",
       "value": "Madagascar"
     },
@@ -1911,9 +1840,8 @@
           "MW",
           "MWI"
         ],
-        "type": "country"
+        "top-level-domain": ".mw"
       },
-      "top-level-domain": ".mw",
       "uuid": "5ed4a624-1c71-443b-8475-73caab1eea8f",
       "value": "Malawi"
     },
@@ -1926,9 +1854,8 @@
           "MY",
           "MYS"
         ],
-        "type": "country"
+        "top-level-domain": ".my"
       },
-      "top-level-domain": ".my",
       "uuid": "add3c024-728a-4507-b29f-9135f93eed14",
       "value": "Malaysia"
     },
@@ -1941,9 +1868,8 @@
           "MV",
           "MDV"
         ],
-        "type": "country"
+        "top-level-domain": ".mv"
       },
-      "top-level-domain": ".mv",
       "uuid": "8449ad6b-a590-4591-8676-2f9101341655",
       "value": "Maldives"
     },
@@ -1956,9 +1882,8 @@
           "ML",
           "MLI"
         ],
-        "type": "country"
+        "top-level-domain": ".ml"
       },
-      "top-level-domain": ".ml",
       "uuid": "f783dd32-8b58-491a-9b10-3028ac64664a",
       "value": "Mali"
     },
@@ -1971,9 +1896,8 @@
           "MT",
           "MLT"
         ],
-        "type": "country"
+        "top-level-domain": ".mt"
       },
-      "top-level-domain": ".mt",
       "uuid": "cd50bf6f-d86f-4470-9734-5aa83fd9e427",
       "value": "Malta"
     },
@@ -1986,9 +1910,8 @@
           "MH",
           "MHL"
         ],
-        "type": "country"
+        "top-level-domain": ".mh"
       },
-      "top-level-domain": ".mh",
       "uuid": "aa71c335-c223-4f5f-956d-c7c82d9a8283",
       "value": "Marshall Islands"
     },
@@ -2001,9 +1924,8 @@
           "MR",
           "MRT"
         ],
-        "type": "country"
+        "top-level-domain": ".mr"
       },
-      "top-level-domain": ".mr",
       "uuid": "a8561bba-3202-4165-8ef9-9e7412e8f5dd",
       "value": "Mauritania"
     },
@@ -2016,9 +1938,8 @@
           "MU",
           "MUS"
         ],
-        "type": "country"
+        "top-level-domain": ".mu"
       },
-      "top-level-domain": ".mu",
       "uuid": "c49266e4-75ab-42dd-a434-5231b72cbc89",
       "value": "Mauritius"
     },
@@ -2031,9 +1952,8 @@
           "YT",
           "MYT"
         ],
-        "type": "country"
+        "top-level-domain": ".yt"
       },
-      "top-level-domain": ".yt",
       "uuid": "aeb9cb0b-706c-44ad-9281-20dd857bbfc4",
       "value": "Mayotte"
     },
@@ -2046,9 +1966,8 @@
           "MX",
           "MEX"
         ],
-        "type": "country"
+        "top-level-domain": ".mx"
       },
-      "top-level-domain": ".mx",
       "uuid": "55777eae-a885-4ee5-9ad3-8df56cddb82b",
       "value": "Mexico"
     },
@@ -2060,8 +1979,7 @@
         "iso-code": [
           "FM",
           "FSM"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "2043d3fc-d110-40e9-84f0-c6eb2904ce58",
       "value": "Micronesia"
@@ -2075,9 +1993,8 @@
           "MD",
           "MDA"
         ],
-        "type": "country"
+        "top-level-domain": ".md"
       },
-      "top-level-domain": ".md",
       "uuid": "8c076c68-08a3-4870-aa1e-bd39d45c1d0b",
       "value": "Moldova"
     },
@@ -2090,9 +2007,8 @@
           "MC",
           "MCO"
         ],
-        "type": "country"
+        "top-level-domain": ".mc"
       },
-      "top-level-domain": ".mc",
       "uuid": "6b3e9217-0047-4a9f-9771-1fe24eb9c466",
       "value": "Monaco"
     },
@@ -2105,9 +2021,8 @@
           "MN",
           "MNG"
         ],
-        "type": "country"
+        "top-level-domain": ".mn"
       },
-      "top-level-domain": ".mn",
       "uuid": "d11a74ac-1ffd-4e92-941a-54fc64b801c6",
       "value": "Mongolia"
     },
@@ -2120,9 +2035,8 @@
           "ME",
           "MNE"
         ],
-        "type": "country"
+        "top-level-domain": ".me"
       },
-      "top-level-domain": ".me",
       "uuid": "b4eab2e9-f67a-449f-8f19-bf22c9bb2cac",
       "value": "Montenegro"
     },
@@ -2135,9 +2049,8 @@
           "MS",
           "MSR"
         ],
-        "type": "country"
+        "top-level-domain": ".ms"
       },
-      "top-level-domain": ".ms",
       "uuid": "e93097db-aa74-40ae-b92a-53f012a74889",
       "value": "Montserrat"
     },
@@ -2150,9 +2063,8 @@
           "MA",
           "MAR"
         ],
-        "type": "country"
+        "top-level-domain": ".ma"
       },
-      "top-level-domain": ".ma",
       "uuid": "04974cc3-fded-4af3-a0e6-0343e83f5f67",
       "value": "Morocco"
     },
@@ -2165,9 +2077,8 @@
           "MZ",
           "MOZ"
         ],
-        "type": "country"
+        "top-level-domain": ".mz"
       },
-      "top-level-domain": ".mz",
       "uuid": "dcc6fc3a-f36b-4137-9c3d-1ed88eb89131",
       "value": "Mozambique"
     },
@@ -2180,9 +2091,8 @@
           "MM",
           "MMR"
         ],
-        "type": "country"
+        "top-level-domain": ".mm"
       },
-      "top-level-domain": ".mm",
       "uuid": "8068b82b-461a-4b8a-acea-f4fe0b12b396",
       "value": "Myanmar"
     },
@@ -2195,9 +2105,8 @@
           "NA",
           "NAM"
         ],
-        "type": "country"
+        "top-level-domain": ".na"
       },
-      "top-level-domain": ".na",
       "uuid": "964471d5-e84a-486c-94e2-95107b59de61",
       "value": "Namibia"
     },
@@ -2210,9 +2119,8 @@
           "NR",
           "NRU"
         ],
-        "type": "country"
+        "top-level-domain": ".nr"
       },
-      "top-level-domain": ".nr",
       "uuid": "2d57902f-14b2-4e04-84ed-b2e24a7bba5f",
       "value": "Nauru"
     },
@@ -2225,9 +2133,8 @@
           "NP",
           "NPL"
         ],
-        "type": "country"
+        "top-level-domain": ".np"
       },
-      "top-level-domain": ".np",
       "uuid": "9f6c918b-246f-43bc-a125-1a2639932fd2",
       "value": "Nepal"
     },
@@ -2240,9 +2147,8 @@
           "NL",
           "NLD"
         ],
-        "type": "country"
+        "top-level-domain": ".nl"
       },
-      "top-level-domain": ".nl",
       "uuid": "1c016908-33df-485c-ba9a-3e629e6f92d9",
       "value": "Netherlands"
     },
@@ -2254,8 +2160,7 @@
         "iso-code": [
           "AN",
           "ANT"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "9da253c5-423a-4fb7-ab98-a2eebc9da34d",
       "value": "Netherlands Antilles"
@@ -2268,8 +2173,7 @@
         "iso-code": [
           "NC",
           "NCL"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "6128fe4d-b7f4-4e9f-be44-7377d1236d7c",
       "value": "New Caledonia"
@@ -2283,9 +2187,8 @@
           "NZ",
           "NZL"
         ],
-        "type": "country"
+        "top-level-domain": ".nz"
       },
-      "top-level-domain": ".nz",
       "uuid": "665da546-a37a-4194-ad73-ff1a5e79b3f7",
       "value": "New Zealand"
     },
@@ -2298,9 +2201,8 @@
           "NI",
           "NIC"
         ],
-        "type": "country"
+        "top-level-domain": ".ni"
       },
-      "top-level-domain": ".ni",
       "uuid": "f0a5a2de-5567-4581-8c99-3459e44d1608",
       "value": "Nicaragua"
     },
@@ -2313,9 +2215,8 @@
           "NE",
           "NER"
         ],
-        "type": "country"
+        "top-level-domain": ".ne"
       },
-      "top-level-domain": ".ne",
       "uuid": "13c9337c-9c06-42fd-ba3f-7128de97ffff",
       "value": "Niger"
     },
@@ -2328,9 +2229,8 @@
           "NG",
           "NGA"
         ],
-        "type": "country"
+        "top-level-domain": ".ng"
       },
-      "top-level-domain": ".ng",
       "uuid": "bdaa0f76-6fd0-4f2d-b6fd-76a97fe06c3b",
       "value": "Nigeria"
     },
@@ -2343,9 +2243,8 @@
           "NU",
           "NIU"
         ],
-        "type": "country"
+        "top-level-domain": ".nu"
       },
-      "top-level-domain": ".nu",
       "uuid": "ccf0effb-f81c-4308-a758-e13cde30d5f7",
       "value": "Niue"
     },
@@ -2358,9 +2257,8 @@
           "KP",
           "PRK"
         ],
-        "type": "country"
+        "top-level-domain": ".kp"
       },
-      "top-level-domain": ".kp",
       "uuid": "cc0bc1cc-6c68-46c2-b9f4-8fdc05f24fde",
       "value": "North Korea"
     },
@@ -2372,8 +2270,7 @@
         "iso-code": [
           "MP",
           "MNP"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "c6b20a69-9ec7-407e-a9f0-f7e7ee1ba123",
       "value": "Northern Mariana Islands"
@@ -2387,9 +2284,8 @@
           "NO",
           "NOR"
         ],
-        "type": "country"
+        "top-level-domain": ".no"
       },
-      "top-level-domain": ".no",
       "uuid": "a39f40d3-8fa5-4024-8c92-58c6a7362af8",
       "value": "Norway"
     },
@@ -2402,9 +2298,8 @@
           "OM",
           "OMN"
         ],
-        "type": "country"
+        "top-level-domain": ".om"
       },
-      "top-level-domain": ".om",
       "uuid": "086ced26-e92c-4b55-9688-0d716d507ada",
       "value": "Oman"
     },
@@ -2417,9 +2312,8 @@
           "PK",
           "PAK"
         ],
-        "type": "country"
+        "top-level-domain": ".pk"
       },
-      "top-level-domain": ".pk",
       "uuid": "6d6c87fd-8da6-465c-a381-b47f3810a6ea",
       "value": "Pakistan"
     },
@@ -2432,9 +2326,8 @@
           "PW",
           "PLW"
         ],
-        "type": "country"
+        "top-level-domain": ".pw"
       },
-      "top-level-domain": ".pw",
       "uuid": "3d7ad346-2b4c-4f51-947c-7c0627457174",
       "value": "Palau"
     },
@@ -2446,8 +2339,7 @@
         "iso-code": [
           "PS",
           "PSE"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "91effc75-e4f6-4aa1-9e32-be5fe56903c9",
       "value": "Palestine"
@@ -2461,9 +2353,8 @@
           "PA",
           "PAN"
         ],
-        "type": "country"
+        "top-level-domain": ".pa"
       },
-      "top-level-domain": ".pa",
       "uuid": "a38eb164-18f8-4ac8-941c-b9911a85c9c1",
       "value": "Panama"
     },
@@ -2476,9 +2367,8 @@
           "PG",
           "PNG"
         ],
-        "type": "country"
+        "top-level-domain": ".pg"
       },
-      "top-level-domain": ".pg",
       "uuid": "ac70053c-5b3b-42b4-b7de-421f097d74e1",
       "value": "Papua New Guinea"
     },
@@ -2491,9 +2381,8 @@
           "PY",
           "PRY"
         ],
-        "type": "country"
+        "top-level-domain": ".py"
       },
-      "top-level-domain": ".py",
       "uuid": "d25565ce-babf-4919-8e64-f894c6d099f7",
       "value": "Paraguay"
     },
@@ -2506,9 +2395,8 @@
           "PE",
           "PER"
         ],
-        "type": "country"
+        "top-level-domain": ".pe"
       },
-      "top-level-domain": ".pe",
       "uuid": "ff45884e-11e3-4b31-b805-8e4cb6c5e4e8",
       "value": "Peru"
     },
@@ -2521,9 +2409,8 @@
           "PH",
           "PHL"
         ],
-        "type": "country"
+        "top-level-domain": ".ph"
       },
-      "top-level-domain": ".ph",
       "uuid": "61e24be6-cf32-4d0f-a8b3-379a05bac8a9",
       "value": "Philippines"
     },
@@ -2535,8 +2422,7 @@
         "iso-code": [
           "PN",
           "PCN"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "5ee746fb-7d00-494c-8dab-1a340a5ea49c",
       "value": "Pitcairn"
@@ -2550,9 +2436,8 @@
           "PL",
           "POL"
         ],
-        "type": "country"
+        "top-level-domain": ".pl"
       },
-      "top-level-domain": ".pl",
       "uuid": "8e73397d-5c08-477e-9b5c-2ef279b5883b",
       "value": "Poland"
     },
@@ -2565,9 +2450,8 @@
           "PT",
           "PRT"
         ],
-        "type": "country"
+        "top-level-domain": ".pt"
       },
-      "top-level-domain": ".pt",
       "uuid": "fb9b1e68-2b99-467b-935d-1e98f312d9d6",
       "value": "Portugal"
     },
@@ -2580,8 +2464,7 @@
         "iso-code": [
           "PR",
           "PRI"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "e9746233-bfd9-499f-b89c-54195295f6a2",
       "value": "Puerto Rico"
@@ -2595,9 +2478,8 @@
           "QA",
           "QAT"
         ],
-        "type": "country"
+        "top-level-domain": ".qa"
       },
-      "top-level-domain": ".qa",
       "uuid": "79da7e74-0680-4c83-8329-2978e730eb91",
       "value": "Qatar"
     },
@@ -2610,9 +2492,8 @@
           "CG",
           "COG"
         ],
-        "type": "country"
+        "top-level-domain": ".cg"
       },
-      "top-level-domain": ".cg",
       "uuid": "5a5a71d8-9973-4a88-8ec5-8da50b24d90c",
       "value": "Republic of the Congo"
     },
@@ -2624,8 +2505,7 @@
         "iso-code": [
           "RE",
           "REU"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "b5ba4bdb-29c1-4907-b7dc-c2172fd83976",
       "value": "Reunion"
@@ -2639,9 +2519,8 @@
           "RO",
           "ROU"
         ],
-        "type": "country"
+        "top-level-domain": ".ro"
       },
-      "top-level-domain": ".ro",
       "uuid": "afa8ac3d-723d-4f10-8756-d8bbefc9eb2e",
       "value": "Romania"
     },
@@ -2654,9 +2533,8 @@
           "RU",
           "RUS"
         ],
-        "type": "country"
+        "top-level-domain": ".ru"
       },
-      "top-level-domain": ".ru",
       "uuid": "f99a8e6e-ccb6-4709-842c-a21e5455ba7c",
       "value": "Russia"
     },
@@ -2669,9 +2547,8 @@
           "RW",
           "RWA"
         ],
-        "type": "country"
+        "top-level-domain": ".rw"
       },
-      "top-level-domain": ".rw",
       "uuid": "d9dac31d-b4d7-4afb-b6fe-d9e09c5d4bac",
       "value": "Rwanda"
     },
@@ -2683,8 +2560,7 @@
         "iso-code": [
           "BL",
           "BLM"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "954b2de5-2f0a-477d-8bea-3fa08a52c04c",
       "value": "Saint Barthelemy"
@@ -2698,9 +2574,8 @@
           "SH",
           "SHN"
         ],
-        "type": "country"
+        "top-level-domain": ".sh"
       },
-      "top-level-domain": ".sh",
       "uuid": "083e69f2-14f1-4d8c-9fb7-4d38d38322cf",
       "value": "Saint Helena"
     },
@@ -2713,9 +2588,8 @@
           "KN",
           "KNA"
         ],
-        "type": "country"
+        "top-level-domain": ".kn"
       },
-      "top-level-domain": ".kn",
       "uuid": "7334c20d-dc91-41ff-925c-08e3e7d22c30",
       "value": "Saint Kitts and Nevis"
     },
@@ -2728,9 +2602,8 @@
           "LC",
           "LCA"
         ],
-        "type": "country"
+        "top-level-domain": ".lc"
       },
-      "top-level-domain": ".lc",
       "uuid": "ceb56016-5c27-42af-a4bd-0022bfcfee7b",
       "value": "Saint Lucia"
     },
@@ -2742,8 +2615,7 @@
         "iso-code": [
           "MF",
           "MAF"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "164b7a25-b531-4630-a398-0cde3a45e7d6",
       "value": "Saint Martin"
@@ -2756,8 +2628,7 @@
         "iso-code": [
           "PM",
           "SPM"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "b45d813b-6fc2-4de1-8406-ecb51b70dd42",
       "value": "Saint Pierre and Miquelon"
@@ -2771,9 +2642,8 @@
           "VC",
           "VCT"
         ],
-        "type": "country"
+        "top-level-domain": ".vc"
       },
-      "top-level-domain": ".vc",
       "uuid": "b46efc73-2cee-4250-aa3e-5e369ef06c5c",
       "value": "Saint Vincent and the Grenadines"
     },
@@ -2786,9 +2656,8 @@
           "WS",
           "WSM"
         ],
-        "type": "country"
+        "top-level-domain": ".ws"
       },
-      "top-level-domain": ".ws",
       "uuid": "8ee23019-4942-498c-89b7-4a6336015974",
       "value": "Samoa"
     },
@@ -2801,9 +2670,8 @@
           "SM",
           "SMR"
         ],
-        "type": "country"
+        "top-level-domain": ".sm"
       },
-      "top-level-domain": ".sm",
       "uuid": "6d739a32-2b94-45cc-8be0-4c65cc8f3ef4",
       "value": "San Marino"
     },
@@ -2815,8 +2683,7 @@
         "iso-code": [
           "ST",
           "STP"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "84455318-8152-4fce-92a2-4e2a38d3ef9a",
       "value": "Sao Tome and Principe"
@@ -2830,9 +2697,8 @@
           "SA",
           "SAU"
         ],
-        "type": "country"
+        "top-level-domain": ".sa"
       },
-      "top-level-domain": ".sa",
       "uuid": "52a4e93d-5e64-4ae2-9f5f-97fbcf75dc55",
       "value": "Saudi Arabia"
     },
@@ -2845,9 +2711,8 @@
           "SN",
           "SEN"
         ],
-        "type": "country"
+        "top-level-domain": ".sn"
       },
-      "top-level-domain": ".sn",
       "uuid": "31d92db8-d6e4-4531-955b-464986df7dad",
       "value": "Senegal"
     },
@@ -2860,9 +2725,8 @@
           "RS",
           "SRB"
         ],
-        "type": "country"
+        "top-level-domain": ".rs"
       },
-      "top-level-domain": ".rs",
       "uuid": "4ec7dd40-4d7a-431c-844d-ee709b8fb935",
       "value": "Serbia"
     },
@@ -2875,9 +2739,8 @@
           "SC",
           "SYC"
         ],
-        "type": "country"
+        "top-level-domain": ".sc"
       },
-      "top-level-domain": ".sc",
       "uuid": "e0f8c503-e005-409b-8915-b2cec757f85b",
       "value": "Seychelles"
     },
@@ -2890,9 +2753,8 @@
           "SL",
           "SLE"
         ],
-        "type": "country"
+        "top-level-domain": ".sl"
       },
-      "top-level-domain": ".sl",
       "uuid": "8acd3be4-fc0f-4dff-bf47-76d3e916c8ca",
       "value": "Sierra Leone"
     },
@@ -2905,9 +2767,8 @@
           "SG",
           "SGP"
         ],
-        "type": "country"
+        "top-level-domain": ".sg"
       },
-      "top-level-domain": ".sg",
       "uuid": "d9e1d8a2-1e57-41f1-b44f-efc26531e0c6",
       "value": "Singapore"
     },
@@ -2920,9 +2781,8 @@
           "SX",
           "SXM"
         ],
-        "type": "country"
+        "top-level-domain": ".sx"
       },
-      "top-level-domain": ".sx",
       "uuid": "5f6c7e19-38a0-4b4e-8799-7dd8ab6e39e1",
       "value": "Sint Maarten"
     },
@@ -2935,9 +2795,8 @@
           "SK",
           "SVK"
         ],
-        "type": "country"
+        "top-level-domain": ".sk"
       },
-      "top-level-domain": ".sk",
       "uuid": "707adc52-2c97-4e56-99fb-9661319117b4",
       "value": "Slovakia"
     },
@@ -2950,9 +2809,8 @@
           "SI",
           "SVN"
         ],
-        "type": "country"
+        "top-level-domain": ".si"
       },
-      "top-level-domain": ".si",
       "uuid": "66b0e8f0-7f94-420b-ac26-b7d874ca6f85",
       "value": "Slovenia"
     },
@@ -2965,9 +2823,8 @@
           "SB",
           "SLB"
         ],
-        "type": "country"
+        "top-level-domain": ".sb"
       },
-      "top-level-domain": ".sb",
       "uuid": "7a5d17e8-7597-4dd0-b009-60998149383e",
       "value": "Solomon Islands"
     },
@@ -2980,9 +2837,8 @@
           "SO",
           "SOM"
         ],
-        "type": "country"
+        "top-level-domain": ".so"
       },
-      "top-level-domain": ".so",
       "uuid": "8250580d-e2a5-4215-af6f-093c21fb4834",
       "value": "Somalia"
     },
@@ -2995,9 +2851,8 @@
           "ZA",
           "ZAF"
         ],
-        "type": "country"
+        "top-level-domain": ".za"
       },
-      "top-level-domain": ".za",
       "uuid": "6b3cc3a2-e95b-43b9-aeaa-1c3867e99319",
       "value": "South Africa"
     },
@@ -3010,9 +2865,8 @@
           "KR",
           "KOR"
         ],
-        "type": "country"
+        "top-level-domain": ".kr"
       },
-      "top-level-domain": ".kr",
       "uuid": "e78f238b-c0f0-4856-acc8-a3ff7b1c9187",
       "value": "South Korea"
     },
@@ -3025,9 +2879,8 @@
           "SS",
           "SSD"
         ],
-        "type": "country"
+        "top-level-domain": ".ss"
       },
-      "top-level-domain": ".ss",
       "uuid": "a152cd53-9a53-46e0-9b84-9d4101a59c5e",
       "value": "South Sudan"
     },
@@ -3040,9 +2893,8 @@
           "ES",
           "ESP"
         ],
-        "type": "country"
+        "top-level-domain": ".es"
       },
-      "top-level-domain": ".es",
       "uuid": "d3400ce2-5701-4141-83ba-66f4fea068ca",
       "value": "Spain"
     },
@@ -3055,9 +2907,8 @@
           "LK",
           "LKA"
         ],
-        "type": "country"
+        "top-level-domain": ".lk"
       },
-      "top-level-domain": ".lk",
       "uuid": "67d858c3-0ea2-4988-9dd4-d17375c5483d",
       "value": "Sri Lanka"
     },
@@ -3070,9 +2921,8 @@
           "SD",
           "SDN"
         ],
-        "type": "country"
+        "top-level-domain": ".sd"
       },
-      "top-level-domain": ".sd",
       "uuid": "210b2138-a4de-4959-9528-9b382f9df98c",
       "value": "Sudan"
     },
@@ -3085,9 +2935,8 @@
           "SR",
           "SUR"
         ],
-        "type": "country"
+        "top-level-domain": ".sr"
       },
-      "top-level-domain": ".sr",
       "uuid": "fa257ff1-9352-45ed-8fea-70fcc88781e0",
       "value": "Suriname"
     },
@@ -3099,8 +2948,7 @@
         "iso-code": [
           "SJ",
           "SJM"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "4e451aef-1bc7-49de-950d-340bbf691a71",
       "value": "Svalbard and Jan Mayen"
@@ -3113,8 +2961,7 @@
         "iso-code": [
           "SZ",
           "SWZ"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "06918b9c-26be-4af8-b7bd-9add29798e7c",
       "value": "Swaziland"
@@ -3128,9 +2975,8 @@
           "SE",
           "SWE"
         ],
-        "type": "country"
+        "top-level-domain": ".se"
       },
-      "top-level-domain": ".se",
       "uuid": "6d3bbf09-dea6-4c99-bf8b-7f75537a8b38",
       "value": "Sweden"
     },
@@ -3143,9 +2989,8 @@
           "CH",
           "CHE"
         ],
-        "type": "country"
+        "top-level-domain": ".ch"
       },
-      "top-level-domain": ".ch",
       "uuid": "56c661d4-471c-4e92-a4e6-349f8edabf41",
       "value": "Switzerland"
     },
@@ -3158,9 +3003,8 @@
           "SY",
           "SYR"
         ],
-        "type": "country"
+        "top-level-domain": ".sy"
       },
-      "top-level-domain": ".sy",
       "uuid": "145a3afd-e9b6-497e-9b8f-a07a3b113c90",
       "value": "Syria"
     },
@@ -3173,9 +3017,8 @@
           "TW",
           "TWN"
         ],
-        "type": "country"
+        "top-level-domain": ".tw"
       },
-      "top-level-domain": ".tw",
       "uuid": "5e8f4b1d-56fb-41ba-8107-1d936679673f",
       "value": "Taiwan"
     },
@@ -3188,9 +3031,8 @@
           "TJ",
           "TJK"
         ],
-        "type": "country"
+        "top-level-domain": ".tj"
       },
-      "top-level-domain": ".tj",
       "uuid": "acc3015b-52f7-46a5-9bcd-b6c69a9af728",
       "value": "Tajikistan"
     },
@@ -3203,9 +3045,8 @@
           "TZ",
           "TZA"
         ],
-        "type": "country"
+        "top-level-domain": ".tz"
       },
-      "top-level-domain": ".tz",
       "uuid": "b63d9a72-3c11-4948-b653-5ea6bdf1ed66",
       "value": "Tanzania"
     },
@@ -3218,9 +3059,8 @@
           "TH",
           "THA"
         ],
-        "type": "country"
+        "top-level-domain": ".th"
       },
-      "top-level-domain": ".th",
       "uuid": "a9a5d54d-933a-41fe-9227-8c44d69e766f",
       "value": "Thailand"
     },
@@ -3233,9 +3073,8 @@
           "TG",
           "TGO"
         ],
-        "type": "country"
+        "top-level-domain": ".tg"
       },
-      "top-level-domain": ".tg",
       "uuid": "6c61d5e6-b9be-466a-a0e0-768def1c5eae",
       "value": "Togo"
     },
@@ -3248,9 +3087,8 @@
           "TK",
           "TKL"
         ],
-        "type": "country"
+        "top-level-domain": ".tk"
       },
-      "top-level-domain": ".tk",
       "uuid": "8e1da827-2562-4c8f-b668-779c7512410c",
       "value": "Tokelau"
     },
@@ -3263,9 +3101,8 @@
           "TO",
           "TON"
         ],
-        "type": "country"
+        "top-level-domain": ".to"
       },
-      "top-level-domain": ".to",
       "uuid": "9d68906f-7e43-4d63-9b81-e3047b4f25e8",
       "value": "Tonga"
     },
@@ -3278,9 +3115,8 @@
           "TT",
           "TTO"
         ],
-        "type": "country"
+        "top-level-domain": ".tt"
       },
-      "top-level-domain": ".tt",
       "uuid": "b42557d5-ec65-41e0-84db-171b3f48e66e",
       "value": "Trinidad and Tobago"
     },
@@ -3293,9 +3129,8 @@
           "TN",
           "TUN"
         ],
-        "type": "country"
+        "top-level-domain": ".tn"
       },
-      "top-level-domain": ".tn",
       "uuid": "7e8d9de1-3e0c-4a9a-809b-e741096d93dc",
       "value": "Tunisia"
     },
@@ -3308,9 +3143,8 @@
           "TR",
           "TUR"
         ],
-        "type": "country"
+        "top-level-domain": ".tr"
       },
-      "top-level-domain": ".tr",
       "uuid": "10cad663-ea15-4803-937d-f1f6bc046f6f",
       "value": "Turkey"
     },
@@ -3323,9 +3157,8 @@
           "TM",
           "TKM"
         ],
-        "type": "country"
+        "top-level-domain": ".tm"
       },
-      "top-level-domain": ".tm",
       "uuid": "b8ac2942-599e-40a4-82d6-dc7d189b1d7f",
       "value": "Turkmenistan"
     },
@@ -3338,9 +3171,8 @@
           "TC",
           "TCA"
         ],
-        "type": "country"
+        "top-level-domain": ".tc"
       },
-      "top-level-domain": ".tc",
       "uuid": "3a7ffa51-20aa-4cf5-ac82-2ba6b9cb0b59",
       "value": "Turks and Caicos Islands"
     },
@@ -3353,9 +3185,8 @@
           "TV",
           "TUV"
         ],
-        "type": "country"
+        "top-level-domain": ".tv"
       },
-      "top-level-domain": ".tv",
       "uuid": "af9953e1-70b7-4925-bdc9-d0799d02aefa",
       "value": "Tuvalu"
     },
@@ -3367,8 +3198,7 @@
         "iso-code": [
           "VI",
           "VIR"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "d93523ea-148e-482b-9447-21569b5a7e9d",
       "value": "U.S. Virgin Islands"
@@ -3382,9 +3212,8 @@
           "UG",
           "UGA"
         ],
-        "type": "country"
+        "top-level-domain": ".ug"
       },
-      "top-level-domain": ".ug",
       "uuid": "5ad9c05c-4725-4cb0-81e7-9d7499bc1f08",
       "value": "Uganda"
     },
@@ -3397,9 +3226,8 @@
           "UA",
           "UKR"
         ],
-        "type": "country"
+        "top-level-domain": ".ua"
       },
-      "top-level-domain": ".ua",
       "uuid": "4e2745c3-2447-4fa4-9e5b-7d32adc01761",
       "value": "Ukraine"
     },
@@ -3412,9 +3240,8 @@
           "AE",
           "ARE"
         ],
-        "type": "country"
+        "top-level-domain": ".ae"
       },
-      "top-level-domain": ".ae",
       "uuid": "ec6d9524-cf39-4081-83e7-f87f5059ab4c",
       "value": "United Arab Emirates"
     },
@@ -3427,9 +3254,8 @@
           "GB",
           "GBR"
         ],
-        "type": "country"
+        "top-level-domain": ".uk"
       },
-      "top-level-domain": ".uk",
       "uuid": "5d0b6a46-f4cf-42ac-b283-e5e28677ec0f",
       "value": "United Kingdom"
     },
@@ -3441,8 +3267,7 @@
         "iso-code": [
           "US",
           "USA"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "59b04875-12f9-49d8-b051-2759bba81824",
       "value": "United States"
@@ -3456,9 +3281,8 @@
           "UY",
           "URY"
         ],
-        "type": "country"
+        "top-level-domain": ".uy"
       },
-      "top-level-domain": ".uy",
       "uuid": "5a5dbbad-e27b-4f47-a3b7-6acfddf0b57c",
       "value": "Uruguay"
     },
@@ -3471,9 +3295,8 @@
           "UZ",
           "UZB"
         ],
-        "type": "country"
+        "top-level-domain": ".uz"
       },
-      "top-level-domain": ".uz",
       "uuid": "46aa0f74-14c1-451a-a269-24141501c861",
       "value": "Uzbekistan"
     },
@@ -3486,9 +3309,8 @@
           "VU",
           "VUT"
         ],
-        "type": "country"
+        "top-level-domain": ".vu"
       },
-      "top-level-domain": ".vu",
       "uuid": "6a1b40ad-b473-46d6-ba02-a66eeb5f9472",
       "value": "Vanuatu"
     },
@@ -3500,8 +3322,7 @@
         "iso-code": [
           "VA",
           "VAT"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "29e47ec8-f47e-43e6-8275-0e7ec185bdc0",
       "value": "Vatican"
@@ -3515,9 +3336,8 @@
           "VE",
           "VEN"
         ],
-        "type": "country"
+        "top-level-domain": ".ve"
       },
-      "top-level-domain": ".ve",
       "uuid": "ff8eae27-8b9f-4a44-98e9-810b74785d5e",
       "value": "Venezuela"
     },
@@ -3530,9 +3350,8 @@
           "VN",
           "VNM"
         ],
-        "type": "country"
+        "top-level-domain": ".vn"
       },
-      "top-level-domain": ".vn",
       "uuid": "7102ea70-2af1-4b23-8d94-a87a9c9aea8e",
       "value": "Vietnam"
     },
@@ -3545,9 +3364,8 @@
           "WF",
           "WLF"
         ],
-        "type": "country"
+        "top-level-domain": ".wf"
       },
-      "top-level-domain": ".wf",
       "uuid": "e343017d-b607-4cd2-8bd9-b3417caa9674",
       "value": "Wallis and Futuna"
     },
@@ -3559,8 +3377,7 @@
         "iso-code": [
           "EH",
           "ESH"
-        ],
-        "type": "country"
+        ]
       },
       "uuid": "7cca85b2-e06c-4c97-86de-0a2b3f473b59",
       "value": "Western Sahara"
@@ -3574,9 +3391,8 @@
           "YE",
           "YEM"
         ],
-        "type": "country"
+        "top-level-domain": ".ye"
       },
-      "top-level-domain": ".ye",
       "uuid": "2813a187-0827-4e70-80f1-ffdb261ec478",
       "value": "Yemen"
     },
@@ -3589,9 +3405,8 @@
           "ZM",
           "ZMB"
         ],
-        "type": "country"
+        "top-level-domain": ".zm"
       },
-      "top-level-domain": ".zm",
       "uuid": "4ec0f561-4798-4b7e-a6f4-df8400284ee6",
       "value": "Zambia"
     },
@@ -3604,9 +3419,8 @@
           "ZW",
           "ZWE"
         ],
-        "type": "country"
+        "top-level-domain": ".zw"
       },
-      "top-level-domain": ".zw",
       "uuid": "da228f94-4412-4226-9113-e19a55cd4aa5",
       "value": "Zimbabwe"
     }