diff --git a/iana-domains-db.json b/iana-domains-db.json
index b69aab7e..87484b4c 100644
--- a/iana-domains-db.json
+++ b/iana-domains-db.json
@@ -21,7 +21,7 @@
     "adac": null,
     "ads": "whois.nic.google",
     "adult": "whois.nic.adult",
-    "ae": "whois.aeda.net.ae",
+    "ae": null,
     "aeg": "whois.nic.aeg",
     "aero": "whois.aero",
     "aetna": "whois.nic.aetna",
@@ -48,7 +48,7 @@
     "ally": "whois.nic.ally",
     "alsace": "whois.nic.alsace",
     "alstom": "whois.nic.alstom",
-    "am": "whois.amnic.net",
+    "am": "whois.nic.am",
     "amazon": "whois.nic.amazon",
     "americanexpress": "whois.nic.americanexpress",
     "americanfamily": "whois.nic.americanfamily",
@@ -58,13 +58,13 @@
     "amsterdam": "whois.nic.amsterdam",
     "an": null,
     "analytics": "whois.nic.analytics",
-    "android": "whois.nic.android",
-    "anquan": "whois.nic.anquan",
+    "android": "whois.nic.google",
+    "anquan": "whois.teleinfo.cn",
     "anz": "whois.nic.anz",
     "ao": null,
     "aol": "whois.nic.aol",
     "apartments": "whois.nic.apartments",
-    "app": "whois.nic.google",
+    "app": "whois.nic.app",
     "apple": "whois.nic.apple",
     "aq": null,
     "aquarelle": "whois.nic.aquarelle",
@@ -83,7 +83,7 @@
     "at": "whois.nic.at",
     "athleta": "whois.nic.athleta",
     "attorney": "whois.nic.attorney",
-    "au": null,
+    "au": "whois.auda.org.au",
     "auction": "whois.nic.auction",
     "audi": "whois.nic.audi",
     "audible": "whois.nic.audible",
@@ -101,7 +101,7 @@
     "azure": "whois.nic.azure",
     "ba": null,
     "baby": "whois.nic.baby",
-    "baidu": "whois.nic.baidu",
+    "baidu": "whois.gtld.knet.cn",
     "banamex": "whois.nic.banamex",
     "bananarepublic": null,
     "band": "whois.nic.band",
@@ -123,7 +123,7 @@
     "bcg": "whois.nic.bcg",
     "bcn": "whois.nic.bcn",
     "bd": null,
-    "be": null,
+    "be": "whois.dns.be",
     "beats": "whois.nic.beats",
     "beauty": "whois.nic.beauty",
     "beer": "whois.nic.beer",
@@ -133,7 +133,7 @@
     "bestbuy": "whois.nic.bestbuy",
     "bet": "whois.nic.bet",
     "bf": "whois.registre.bf",
-    "bg": "whois.register.bg",
+    "bg": null,
     "bh": "whois.nic.bh",
     "bharti": "whois.nic.bharti",
     "bi": "whois1.nic.bi",
@@ -156,16 +156,16 @@
     "bm": "whois.nic.bm",
     "bms": "whois.nic.bms",
     "bmw": "whois.nic.bmw",
-    "bn": "whois.bnnic.bn",
+    "bn": null,
     "bnl": null,
     "bnpparibas": "whois.nic.bnpparibas",
     "bo": null,
     "boats": "whois.nic.boats",
     "boehringer": "whois.nic.boehringer",
     "bofa": "whois.nic.bofa",
-    "bom": "whois.nic.bom",
+    "bom": "whois.gtlds.nic.br",
     "bond": "whois.nic.bond",
-    "boo": "whois.nic.boo",
+    "boo": "whois.nic.google",
     "book": "whois.nic.book",
     "booking": "whois.nic.booking",
     "boots": null,
@@ -194,13 +194,13 @@
     "buzz": "whois.nic.buzz",
     "bv": null,
     "bw": null,
-    "by": "whois.cctld.by",
+    "by": null,
     "bz": null,
     "bzh": "whois.nic.bzh",
     "ca": "whois.cira.ca",
     "cab": "whois.nic.cab",
     "cafe": "whois.nic.cafe",
-    "cal": "whois.nic.cal",
+    "cal": "whois.nic.google",
     "call": "whois.nic.call",
     "calvinklein": "whois.nic.calvinklein",
     "cam": "whois.nic.cam",
@@ -231,19 +231,19 @@
     "cbn": "whois.nic.cbn",
     "cbre": "whois.nic.cbre",
     "cbs": null,
-    "cc": "ccwhois.verisign-grs.com",
+    "cc": "whois.nic.cc",
     "cd": "whois.nic.cd",
     "ceb": null,
     "center": "whois.nic.center",
     "ceo": "whois.nic.ceo",
     "cern": "whois.nic.cern",
-    "cf": "whois.dot.cf",
+    "cf": null,
     "cfa": "whois.nic.cfa",
     "cfd": "whois.nic.cfd",
     "cg": null,
     "ch": "whois.nic.ch",
     "chanel": "whois.nic.chanel",
-    "channel": "whois.nic.channel",
+    "channel": "whois.nic.google",
     "charity": "whois.nic.charity",
     "chase": "whois.nic.chase",
     "chat": "whois.nic.chat",
@@ -251,7 +251,7 @@
     "chintai": "whois.nic.chintai",
     "chloe": null,
     "christmas": "whois.nic.christmas",
-    "chrome": "whois.nic.google",
+    "chrome": "whois.nic.chrome",
     "chrysler": null,
     "church": "whois.nic.church",
     "ci": null,
@@ -275,14 +275,14 @@
     "club": "whois.nic.club",
     "clubmed": "whois.nic.clubmed",
     "cm": "whois.netcom.cm",
-    "cn": "whois.cnnic.cn",
+    "cn": null,
     "co": "whois.nic.co",
     "coach": "whois.nic.coach",
     "codes": "whois.nic.codes",
     "coffee": "whois.nic.coffee",
     "college": "whois.nic.college",
     "cologne": "whois.nic.cologne",
-    "com": null,
+    "com": "whois.verisign-grs.com",
     "comcast": null,
     "commbank": "whois.nic.commbank",
     "community": "whois.nic.community",
@@ -332,7 +332,7 @@
     "dating": "whois.nic.dating",
     "datsun": "whois.nic.gmo",
     "day": "whois.nic.day",
-    "dclk": "whois.nic.dclk",
+    "dclk": "whois.nic.google",
     "dds": "whois.nic.dds",
     "de": "whois.denic.de",
     "deal": "whois.nic.deal",
@@ -348,7 +348,7 @@
     "dentist": "whois.nic.dentist",
     "desi": "whois.nic.desi",
     "design": "whois.nic.design",
-    "dev": "whois.nic.dev",
+    "dev": "whois.nic.google",
     "dhl": "whois.nic.dhl",
     "diamonds": "whois.nic.diamonds",
     "diet": "whois.nic.diet",
@@ -360,7 +360,7 @@
     "dish": "whois.nic.dish",
     "diy": "whois.nic.diy",
     "dj": null,
-    "dk": "whois.nic.dk",
+    "dk": "whois.punktum.dk",
     "dm": "whois.dmdomains.dm",
     "dnp": "whois.nic.dnp",
     "do": "whois.nic.do",
@@ -373,7 +373,7 @@
     "doosan": null,
     "dot": "whois.nic.dot",
     "download": "whois.nic.download",
-    "drive": "whois.nic.drive",
+    "drive": "whois.nic.google",
     "dtv": "whois.nic.dtv",
     "dubai": "whois.nic.dubai",
     "duck": null,
@@ -383,10 +383,10 @@
     "durban": "whois.nic.durban",
     "dvag": "whois.nic.dvag",
     "dvr": "whois.nic.dvr",
-    "dz": "whois.nic.dz",
+    "dz": null,
     "earth": "whois.nic.earth",
     "eat": "whois.nic.google",
-    "ec": null,
+    "ec": "whois.nic.ec",
     "eco": "whois.nic.eco",
     "edeka": "whois.nic.edeka",
     "edu": "whois.educause.edu",
@@ -412,7 +412,7 @@
     "esurance": null,
     "et": null,
     "etisalat": null,
-    "eu": null,
+    "eu": "whois.eu",
     "eurovision": "whois.nic.eurovision",
     "eus": "whois.nic.eus",
     "events": "whois.nic.events",
@@ -452,7 +452,7 @@
     "fishing": "whois.nic.fishing",
     "fit": "whois.nic.fit",
     "fitness": "whois.nic.fitness",
-    "fj": "www.whois.fj",
+    "fj": null,
     "fk": null,
     "flickr": "whois.nic.flickr",
     "flights": "whois.nic.flights",
@@ -460,7 +460,7 @@
     "florist": "whois.nic.florist",
     "flowers": "whois.nic.flowers",
     "flsmidth": null,
-    "fly": null,
+    "fly": "whois.nic.google",
     "fm": "whois.nic.fm",
     "fo": "whois.nic.fo",
     "foo": "whois.nic.foo",
@@ -481,7 +481,7 @@
     "frontdoor": null,
     "frontier": "whois.nic.frontier",
     "ftr": "whois.nic.ftr",
-    "fujitsu": "whois.nic.fujitsu",
+    "fujitsu": "whois.nic.gmo",
     "fujixerox": null,
     "fun": "whois.nic.fun",
     "fund": "whois.nic.fund",
@@ -501,7 +501,7 @@
     "gb": null,
     "gbiz": "whois.nic.google",
     "gd": "whois.nic.gd",
-    "gdn": null,
+    "gdn": "whois.nic.gdn",
     "ge": "whois.nic.ge",
     "gea": "whois.nic.gea",
     "gent": "whois.nic.gent",
@@ -512,36 +512,36 @@
     "ggee": "whois.nic.ggee",
     "gh": "whois.nic.gh",
     "gi": "whois.identitydigital.services",
-    "gift": "whois.uniregistry.net",
+    "gift": "whois.nic.gift",
     "gifts": "whois.nic.gifts",
     "gives": "whois.nic.gives",
     "giving": "whois.nic.giving",
     "gl": "whois.nic.gl",
     "glade": null,
     "glass": "whois.nic.glass",
-    "gle": "whois.nic.google",
+    "gle": "whois.nic.gle",
     "global": "whois.nic.global",
     "globo": "whois.gtlds.nic.br",
     "gm": null,
-    "gmail": "whois.nic.gmail",
+    "gmail": "whois.nic.google",
     "gmbh": "whois.nic.gmbh",
     "gmo": "whois.nic.gmo",
     "gmx": "whois.nic.gmx",
-    "gn": null,
+    "gn": "whois.ande.gov.gn",
     "godaddy": "whois.nic.godaddy",
     "gold": "whois.nic.gold",
     "goldpoint": "whois.nic.goldpoint",
     "golf": "whois.nic.golf",
-    "goo": "whois.nic.gmo",
+    "goo": "whois.nic.goo",
     "goodhands": null,
     "goodyear": "whois.nic.goodyear",
     "goog": "whois.nic.google",
     "google": "whois.nic.google",
     "gop": "whois.nic.gop",
     "got": "whois.nic.got",
-    "gov": "whois.nic.gov",
-    "gp": null,
-    "gq": null,
+    "gov": "whois.dotgov.gov",
+    "gp": "whois.nic.gp",
+    "gq": "whois.dominio.gq",
     "gr": null,
     "grainger": "whois.nic.grainger",
     "graphics": "whois.nic.graphics",
@@ -555,12 +555,12 @@
     "gu": null,
     "guardian": null,
     "gucci": "whois.nic.gucci",
-    "guge": "whois.nic.google",
+    "guge": "whois.nic.guge",
     "guide": "whois.nic.guide",
     "guitars": "whois.nic.guitars",
     "guru": "whois.nic.guru",
     "gw": null,
-    "gy": null,
+    "gy": "whois.registry.gy",
     "hair": "whois.nic.hair",
     "hamburg": "whois.nic.hamburg",
     "hangout": "whois.nic.google",
@@ -601,8 +601,8 @@
     "hotels": "whois.nic.hotels",
     "hotmail": "whois.nic.hotmail",
     "house": "whois.nic.house",
-    "how": "whois.nic.how",
-    "hr": "whois.nic.hr",
+    "how": "whois.nic.google",
+    "hr": "whois.dns.hr",
     "hsbc": "whois.nic.hsbc",
     "ht": "whois.nic.ht",
     "htc": null,
@@ -614,29 +614,29 @@
     "icbc": "whois.nic.icbc",
     "ice": "whois.nic.ice",
     "icu": "whois.nic.icu",
-    "id": "whois.id",
-    "ie": "whois.weare.ie",
+    "id": null,
+    "ie": null,
     "ieee": "whois.nic.ieee",
     "ifm": "whois.nic.ifm",
     "iinet": null,
     "ikano": "whois.nic.ikano",
-    "il": "whois.isoc.org.il",
+    "il": null,
     "im": "whois.nic.im",
     "imamat": "whois.nic.imamat",
     "imdb": "whois.nic.imdb",
     "immo": "whois.nic.immo",
     "immobilien": "whois.nic.immobilien",
-    "in": null,
+    "in": "whois.registry.in",
     "inc": "whois.nic.inc",
     "industries": "whois.nic.industries",
-    "infiniti": "whois.nic.infiniti",
+    "infiniti": "whois.nic.gmo",
     "info": "whois.nic.info",
-    "ing": "whois.nic.ing",
+    "ing": "whois.nic.google",
     "ink": "whois.nic.ink",
     "institute": "whois.nic.institute",
     "insurance": "whois.nic.insurance",
     "insure": "whois.nic.insure",
-    "int": "whois.iana.org",
+    "int": null,
     "intel": null,
     "international": "whois.nic.international",
     "intuit": "whois.nic.intuit",
@@ -646,7 +646,7 @@
     "iq": null,
     "ir": "whois.nic.ir",
     "irish": "whois.nic.irish",
-    "is": "whois.isnic.is",
+    "is": "whois.nic.is",
     "iselect": null,
     "ismaili": "whois.nic.ismaili",
     "ist": "whois.nic.ist",
@@ -675,10 +675,10 @@
     "joburg": "whois.nic.joburg",
     "jot": "whois.nic.jot",
     "joy": "whois.nic.joy",
-    "jp": null,
+    "jp": "whois.jprs.jp",
     "jpmorgan": "whois.nic.jpmorgan",
     "jprs": "whois.nic.jprs",
-    "juegos": "whois.nic.juegos",
+    "juegos": "whois.uniregistry.net",
     "juniper": "whois.nic.juniper",
     "kaufen": "whois.nic.kaufen",
     "kddi": "whois.nic.kddi",
@@ -687,7 +687,7 @@
     "kerrylogistics": "whois.nic.kerrylogistics",
     "kerryproperties": "whois.nic.kerryproperties",
     "kfh": "whois.nic.kfh",
-    "kg": "whois.kg",
+    "kg": null,
     "kh": null,
     "ki": "whois.nic.ki",
     "kia": "whois.nic.kia",
@@ -699,7 +699,7 @@
     "kiwi": "whois.nic.kiwi",
     "km": null,
     "kn": "whois.nic.kn",
-    "koeln": "whois.nic.koeln",
+    "koeln": "whois.ryce-rsp.com",
     "komatsu": "whois.nic.komatsu",
     "kosher": "whois.nic.kosher",
     "kp": null,
@@ -710,7 +710,7 @@
     "kred": "whois.nic.kred",
     "kuokgroup": "whois.nic.kuokgroup",
     "kw": "whois.nic.kw",
-    "ky": "whois.kyregistry.ky",
+    "ky": null,
     "kyoto": "whois.nic.kyoto",
     "kz": "whois.nic.kz",
     "la": "whois.nic.la",
@@ -730,7 +730,7 @@
     "latrobe": "whois.nic.latrobe",
     "law": "whois.nic.law",
     "lawyer": "whois.nic.lawyer",
-    "lb": "whois.lbdr.org.lb",
+    "lb": null,
     "lc": null,
     "lds": "whois.nic.lds",
     "lease": "whois.nic.lease",
@@ -753,7 +753,7 @@
     "limo": "whois.nic.limo",
     "lincoln": "whois.nic.lincoln",
     "linde": null,
-    "link": "whois.nic.link",
+    "link": "whois.uniregistry.net",
     "lipsy": "whois.nic.lipsy",
     "live": "whois.nic.live",
     "living": "whois.nic.living",
@@ -778,14 +778,14 @@
     "lt": "whois.domreg.lt",
     "ltd": "whois.nic.ltd",
     "ltda": "whois.nic.ltda",
-    "lu": null,
+    "lu": "whois.dns.lu",
     "lundbeck": "whois.nic.lundbeck",
     "lupin": null,
     "luxe": "whois.nic.luxe",
     "luxury": "whois.nic.luxury",
     "lv": "whois.nic.lv",
     "ly": "whois.nic.ly",
-    "ma": "whois.registre.ma",
+    "ma": null,
     "macys": null,
     "madrid": "whois.nic.madrid",
     "maif": "whois.nic.maif",
@@ -794,7 +794,7 @@
     "man": "whois.nic.man",
     "management": "whois.nic.management",
     "mango": "whois.nic.mango",
-    "map": "whois.nic.map",
+    "map": "whois.nic.google",
     "market": "whois.nic.market",
     "marketing": "whois.nic.marketing",
     "markets": "whois.nic.markets",
@@ -834,7 +834,7 @@
     "ml": "whois.nic.ml",
     "mlb": "whois.nic.mlb",
     "mls": "whois.nic.mls",
-    "mm": null,
+    "mm": "whois.registry.gov.mm",
     "mma": "whois.nic.mma",
     "mn": "whois.nic.mn",
     "mo": "whois.monic.mo",
@@ -855,7 +855,7 @@
     "moscow": "whois.nic.moscow",
     "moto": "whois.nic.moto",
     "motorcycles": "whois.nic.motorcycles",
-    "mov": "whois.nic.mov",
+    "mov": "whois.nic.google",
     "movie": "whois.nic.movie",
     "movistar": null,
     "mp": null,
@@ -874,8 +874,8 @@
     "mutuelle": null,
     "mv": null,
     "mw": "whois.nic.mw",
-    "mx": "whois.mx",
-    "my": "whois.mynic.my",
+    "mx": null,
+    "my": null,
     "mz": "whois.nic.mz",
     "na": null,
     "nab": "whois.nic.nab",
@@ -894,7 +894,7 @@
     "netflix": "whois.nic.netflix",
     "network": "whois.nic.network",
     "neustar": "whois.nic.neustar",
-    "new": "whois.nic.google",
+    "new": "whois.nic.new",
     "newholland": null,
     "news": "whois.nic.news",
     "next": "whois.nic.next",
@@ -902,7 +902,7 @@
     "nexus": "whois.nic.nexus",
     "nf": "whois.nic.nf",
     "nfl": "whois.nic.nfl",
-    "ng": "whois.nic.net.ng",
+    "ng": null,
     "ngo": "whois.nic.ngo",
     "nhk": "whois.nic.nhk",
     "ni": null,
@@ -957,9 +957,9 @@
     "ott": "whois.nic.ott",
     "ovh": "whois.nic.ovh",
     "pa": null,
-    "page": "whois.nic.page",
+    "page": "whois.nic.google",
     "pamperedchef": null,
-    "panasonic": "whois.nic.panasonic",
+    "panasonic": "whois.nic.gmo",
     "panerai": null,
     "paris": "whois.nic.paris",
     "pars": "whois.nic.pars",
@@ -969,14 +969,14 @@
     "passagens": null,
     "pay": "whois.nic.pay",
     "pccw": "whois.nic.pccw",
-    "pe": "kero.yachay.pe",
+    "pe": "whois.nic.pe",
     "pet": "whois.nic.pet",
-    "pf": "whois.registry.pf",
+    "pf": null,
     "pfizer": "whois.nic.pfizer",
     "pg": null,
     "ph": null,
     "pharmacy": "whois.nic.pharmacy",
-    "phd": "whois.nic.phd",
+    "phd": "whois.nic.google",
     "philips": "whois.nic.philips",
     "phone": "whois.nic.phone",
     "photo": "whois.nic.photo",
@@ -1007,7 +1007,7 @@
     "poker": "whois.nic.poker",
     "politie": "whois.nic.politie",
     "porn": "whois.nic.porn",
-    "post": "whois.dotpostregistry.net",
+    "post": "whois.nic.post",
     "pr": "whois.afilias-srs.net",
     "pramerica": "whois.nic.pramerica",
     "praxi": "whois.nic.praxi",
@@ -1016,7 +1016,7 @@
     "pro": "whois.nic.pro",
     "prod": "whois.nic.prod",
     "productions": "whois.nic.productions",
-    "prof": "whois.nic.google",
+    "prof": "whois.nic.prof",
     "progressive": "whois.nic.progressive",
     "promo": "whois.nic.promo",
     "properties": "whois.nic.properties",
@@ -1030,7 +1030,7 @@
     "pw": "whois.nic.pw",
     "pwc": "whois.nic.pwc",
     "py": null,
-    "qa": "whois.registry.qa",
+    "qa": null,
     "qpon": "whois.nic.qpon",
     "quebec": "whois.nic.quebec",
     "quest": "whois.nic.quest",
@@ -1068,18 +1068,18 @@
     "ricoh": "whois.nic.ricoh",
     "rightathome": null,
     "ril": "whois.nic.ril",
-    "rio": "whois.nic.rio",
+    "rio": "whois.gtlds.nic.br",
     "rip": "whois.nic.rip",
     "rmit": null,
-    "ro": "whois.rotld.ro",
+    "ro": null,
     "rocher": null,
     "rocks": "whois.nic.rocks",
     "rodeo": "whois.nic.rodeo",
     "rogers": "whois.nic.rogers",
     "room": "whois.nic.room",
-    "rs": "whois.rnids.rs",
-    "rsvp": "whois.nic.google",
-    "ru": "whois.tcinet.ru",
+    "rs": null,
+    "rsvp": "whois.nic.rsvp",
+    "ru": "whois.nic.ru",
     "rugby": "whois.nic.rugby",
     "ruhr": "whois.nic.ruhr",
     "run": "whois.nic.run",
@@ -1110,7 +1110,7 @@
     "sc": "whois.nic.sc",
     "sca": null,
     "scb": "whois.nic.scb",
-    "schaeffler": "whois.nic.schaeffler",
+    "schaeffler": "whois.afilias-srs.net",
     "schmidt": "whois.nic.schmidt",
     "scholarships": "whois.nic.scholarships",
     "school": "whois.nic.school",
@@ -1136,7 +1136,7 @@
     "sex": "whois.nic.sex",
     "sexy": "whois.nic.sexy",
     "sfr": "whois.nic.sfr",
-    "sg": "whois.sgnic.sg",
+    "sg": null,
     "sh": "whois.nic.sh",
     "shangrila": "whois.nic.shangrila",
     "sharp": "whois.nic.sharp",
@@ -1157,7 +1157,7 @@
     "singles": "whois.nic.singles",
     "site": "whois.nic.site",
     "sj": null,
-    "sk": "whois.sk-nic.sk",
+    "sk": null,
     "ski": "whois.nic.ski",
     "skin": "whois.nic.skin",
     "sky": "whois.nic.sky",
@@ -1211,7 +1211,7 @@
     "sucks": "whois.nic.sucks",
     "supplies": "whois.nic.supplies",
     "supply": "whois.nic.supply",
-    "support": null,
+    "support": "whois.nic.support",
     "surf": "whois.nic.surf",
     "surgery": "whois.nic.surgery",
     "suzuki": "whois.nic.suzuki",
@@ -1220,7 +1220,7 @@
     "swiftcover": null,
     "swiss": "whois.nic.swiss",
     "sx": null,
-    "sy": "whois.tld.sy",
+    "sy": null,
     "sydney": "whois.nic.sydney",
     "symantec": null,
     "systems": "whois.nic.systems",
@@ -1264,13 +1264,13 @@
     "tj": null,
     "tjmaxx": "whois.nic.tjmaxx",
     "tjx": "whois.nic.tjx",
-    "tk": null,
+    "tk": "whois.dot.tk",
     "tkmaxx": "whois.nic.tkmaxx",
-    "tl": null,
+    "tl": "whois.nic.tl",
     "tm": "whois.nic.tm",
     "tmall": "whois.nic.tmall",
-    "tn": null,
-    "to": null,
+    "tn": "whois.ati.tn",
+    "to": "whois.tonic.to",
     "today": "whois.nic.today",
     "tokyo": "whois.nic.tokyo",
     "tools": "whois.nic.tools",
@@ -1300,9 +1300,9 @@
     "tushu": "whois.nic.tushu",
     "tv": "whois.nic.tv",
     "tvs": "whois.nic.tvs",
-    "tw": "whois.twnic.net.tw",
-    "tz": "whois.tznic.or.tz",
-    "ua": "whois.ua",
+    "tw": null,
+    "tz": null,
+    "ua": null,
     "ubank": "whois.nic.ubank",
     "ubs": "whois.nic.ubs",
     "uconnect": null,
@@ -1315,13 +1315,13 @@
     "uol": "whois.gtlds.nic.br",
     "ups": "whois.nic.ups",
     "us": "whois.nic.us",
-    "uy": null,
-    "uz": null,
+    "uy": "whois.nic.org.uy",
+    "uz": "whois.cctld.uz",
     "va": null,
     "vacations": "whois.nic.vacations",
     "vana": "whois.nic.vana",
     "vanguard": "whois.nic.vanguard",
-    "vc": null,
+    "vc": "whois.identitydigital.services",
     "ve": "whois.nic.ve",
     "vegas": "whois.nic.vegas",
     "ventures": "whois.nic.ventures",
@@ -1358,7 +1358,7 @@
     "wales": "whois.nic.wales",
     "walmart": "whois.nic.walmart",
     "walter": "whois.nic.walter",
-    "wang": "whois.gtld.knet.cn",
+    "wang": "whois.nic.wang",
     "wanggou": "whois.nic.wanggou",
     "warman": null,
     "watch": "whois.nic.watch",
@@ -1388,7 +1388,7 @@
     "works": "whois.nic.works",
     "world": "whois.nic.world",
     "wow": "whois.nic.wow",
-    "ws": null,
+    "ws": "whois.website.ws",
     "wtc": "whois.nic.wtc",
     "wtf": "whois.nic.wtf",
     "xbox": "whois.nic.xbox",
@@ -1400,20 +1400,20 @@
     "xn--11b4c3d": "whois.nic.xn--11b4c3d",
     "xn--11b5bs3a9aj6g": null,
     "xn--1ck2e1b": "whois.nic.xn--1ck2e1b",
-    "xn--1qqw23a": "whois.ngtld.cn",
+    "xn--1qqw23a": "whois.nic.xn--1qqw23a",
     "xn--2scrj9c": null,
     "xn--30rr7y": "whois.nic.xn--30rr7y",
     "xn--3bst00m": "whois.nic.xn--3bst00m",
     "xn--3ds443g": "whois.nic.xn--3ds443g",
-    "xn--3e0b707e": "whois.kr",
+    "xn--3e0b707e": null,
     "xn--3hcrj9c": null,
     "xn--3oq18vl8pn36a": null,
     "xn--3pxu8k": "whois.nic.xn--3pxu8k",
     "xn--42c2d9a": "whois.nic.xn--42c2d9a",
     "xn--45br5cyl": "whois.registry.in",
-    "xn--45brj9c": null,
+    "xn--45brj9c": "whois.registry.in",
     "xn--45q11c": "whois.gtld.knet.cn",
-    "xn--4dbrk0ce": "whois.isoc.org.il",
+    "xn--4dbrk0ce": null,
     "xn--4gbrim": "whois.nic.xn--4gbrim",
     "xn--54b7fta0cc": null,
     "xn--55qw42g": "whois.conac.cn",
@@ -1456,13 +1456,13 @@
     "xn--estv75g": null,
     "xn--fct429k": "whois.nic.xn--fct429k",
     "xn--fhbei": "whois.nic.xn--fhbei",
-    "xn--fiq228c5hs": "whois.nic.xn--fiq228c5hs",
-    "xn--fiq64b": "whois.nic.xn--fiq64b",
-    "xn--fiqs8s": null,
+    "xn--fiq228c5hs": "whois.teleinfo.cn",
+    "xn--fiq64b": "whois.gtld.knet.cn",
+    "xn--fiqs8s": "cwhois.cnnic.cn",
     "xn--fiqz9s": null,
     "xn--fjq720a": "whois.nic.xn--fjq720a",
-    "xn--flw351e": "whois.nic.google",
-    "xn--fpcrj9c3d": "whois.registry.in",
+    "xn--flw351e": "whois.nic.xn--flw351e",
+    "xn--fpcrj9c3d": null,
     "xn--fzc2c9e2c": null,
     "xn--fzys8d69uvgm": "whois.nic.xn--fzys8d69uvgm",
     "xn--g2xx48c": "whois.nic.xn--g2xx48c",
@@ -1475,13 +1475,13 @@
     "xn--h2brj9c8c": "whois.registry.in",
     "xn--hgbk6aj7f53bba": null,
     "xn--hlcj6aya9esc7a": null,
-    "xn--hxt814e": "whois.gtld.knet.cn",
+    "xn--hxt814e": "whois.nic.xn--hxt814e",
     "xn--i1b6b1a6a2e": "whois.nic.xn--i1b6b1a6a2e",
     "xn--imr513n": "whois.nic.xn--imr513n",
-    "xn--io0a7i": "whois.ngtld.cn",
+    "xn--io0a7i": "whois.nic.xn--io0a7i",
     "xn--j1aef": "whois.nic.xn--j1aef",
-    "xn--j1amh": null,
-    "xn--j6w193g": null,
+    "xn--j1amh": "whois.dotukr.com",
+    "xn--j6w193g": "whois.hkirc.hk",
     "xn--jlq480n2rg": "whois.nic.xn--jlq480n2rg",
     "xn--jlq61u9w7b": null,
     "xn--jvr189m": "whois.nic.xn--jvr189m",
@@ -1496,7 +1496,7 @@
     "xn--lgbbat1ad8j": "whois.nic.dz",
     "xn--mgb9awbf": "whois.registry.om",
     "xn--mgba3a3ejt": "whois.nic.xn--mgba3a3ejt",
-    "xn--mgba3a4f16a": null,
+    "xn--mgba3a4f16a": "whois.nic.ir",
     "xn--mgba7c0bbn0a": "whois.nic.xn--mgba7c0bbn0a",
     "xn--mgbaakc7dvf": null,
     "xn--mgbaam7a8h": null,
@@ -1505,17 +1505,17 @@
     "xn--mgbai9azgqp6j": null,
     "xn--mgbayh7gpa": null,
     "xn--mgbb9fbpob": null,
-    "xn--mgbbh1a": "whois.registry.in",
-    "xn--mgbbh1a71e": "whois.registry.in",
+    "xn--mgbbh1a": null,
+    "xn--mgbbh1a71e": null,
     "xn--mgbc0a9azcg": null,
     "xn--mgbca7dzdo": "whois.nic.xn--mgbca7dzdo",
     "xn--mgbcpq6gpa1a": null,
-    "xn--mgberp4a5d4ar": null,
+    "xn--mgberp4a5d4ar": "whois.nic.net.sa",
     "xn--mgbgu82a": "whois.registry.in",
     "xn--mgbi4ecexp": "whois.nic.xn--mgbi4ecexp",
     "xn--mgbpl2fh": null,
     "xn--mgbt3dhd": "whois.nic.xn--mgbt3dhd",
-    "xn--mgbtx2b": null,
+    "xn--mgbtx2b": "whois.cmc.iq",
     "xn--mgbx4cd0ab": "whois.mynic.my",
     "xn--mix891f": "whois.monic.mo",
     "xn--mk1bu44c": "whois.nic.xn--mk1bu44c",
@@ -1527,11 +1527,11 @@
     "xn--nqv7f": "whois.nic.xn--nqv7f",
     "xn--nqv7fs00ema": "whois.nic.xn--nqv7fs00ema",
     "xn--nyqy26a": "whois.nic.xn--nyqy26a",
-    "xn--o3cw4h": null,
+    "xn--o3cw4h": "whois.thnic.co.th",
     "xn--ogbpf8fl": "whois.tld.sy",
     "xn--otu796d": "whois.nic.xn--otu796d",
     "xn--p1acf": "whois.nic.xn--p1acf",
-    "xn--p1ai": "whois.tcinet.ru",
+    "xn--p1ai": null,
     "xn--pbt977c": null,
     "xn--pgbs0dh": "whois.ati.tn",
     "xn--pssy2u": "whois.nic.xn--pssy2u",
@@ -1543,7 +1543,7 @@
     "xn--rhqv96g": "whois.nic.xn--rhqv96g",
     "xn--rovu88b": "whois.nic.xn--rovu88b",
     "xn--rvc1e0am3e": "whois.registry.in",
-    "xn--s9brj9c": "whois.registry.in",
+    "xn--s9brj9c": null,
     "xn--ses554g": "whois.nic.xn--ses554g",
     "xn--t60b56a": "whois.nic.xn--t60b56a",
     "xn--tckwe": "whois.nic.xn--tckwe",
@@ -1552,14 +1552,14 @@
     "xn--vermgensberater-ctb": "whois.nic.xn--vermgensberater-ctb",
     "xn--vermgensberatung-pwb": "whois.nic.xn--vermgensberatung-pwb",
     "xn--vhquv": "whois.nic.xn--vhquv",
-    "xn--vuq861b": "whois.nic.xn--vuq861b",
+    "xn--vuq861b": "whois.teleinfo.cn",
     "xn--w4r85el8fhu5dnra": "whois.nic.xn--w4r85el8fhu5dnra",
     "xn--w4rs40l": "whois.nic.xn--w4rs40l",
     "xn--wgbh1c": "whois.dotmasr.eg",
-    "xn--wgbl6a": null,
+    "xn--wgbl6a": "whois.registry.qa",
     "xn--xhq521b": "whois.ngtld.cn",
     "xn--xkc2al3hye2a": null,
-    "xn--xkc2dl3a5ee0h": "whois.registry.in",
+    "xn--xkc2dl3a5ee0h": null,
     "xn--y9a3aq": "whois.amnic.net",
     "xn--yfro4i67o": "whois.zh.sgnic.sg",
     "xn--ygbi2ammx": "whois.pnina.ps",
@@ -1572,21 +1572,21 @@
     "yahoo": "whois.nic.yahoo",
     "yamaxun": "whois.nic.yamaxun",
     "yandex": "whois.nic.yandex",
-    "ye": null,
-    "yodobashi": "whois.nic.yodobashi",
+    "ye": "whois.y.net.ye",
+    "yodobashi": "whois.nic.gmo",
     "yoga": "whois.nic.yoga",
     "yokohama": "whois.nic.yokohama",
     "you": "whois.nic.you",
-    "youtube": "whois.nic.google",
+    "youtube": "whois.nic.youtube",
     "yt": "whois.nic.yt",
-    "yun": "whois.teleinfo.cn",
+    "yun": "whois.nic.yun",
     "za": "whois.nic.za",
     "zappos": "whois.nic.zappos",
     "zara": "whois.nic.zara",
     "zero": "whois.nic.zero",
-    "zip": "whois.nic.zip",
+    "zip": "whois.nic.google",
     "zippo": null,
-    "zm": "whois.nic.zm",
+    "zm": "whois.zicta.zm",
     "zone": "whois.nic.zone",
     "zuerich": "whois.nic.zuerich",
     "zw": null