diff --git a/iana-domains-db.json b/iana-domains-db.json
index 7077ec57..e021860a 100644
--- a/iana-domains-db.json
+++ b/iana-domains-db.json
@@ -19,7 +19,7 @@
     "actor": "whois.nic.actor",
     "ad": "whois.nic.ad",
     "adac": null,
-    "ads": "whois.nic.google",
+    "ads": "whois.nic.ads",
     "adult": "whois.nic.adult",
     "ae": null,
     "aeg": "whois.nic.aeg",
@@ -41,10 +41,10 @@
     "akdn": "whois.nic.akdn",
     "al": null,
     "alfaromeo": null,
-    "alibaba": "whois.nic.alibaba",
+    "alibaba": null,
     "alipay": "whois.nic.alipay",
     "allfinanz": "whois.nic.allfinanz",
-    "allstate": "whois.nic.allstate",
+    "allstate": null,
     "ally": "whois.nic.ally",
     "alsace": "whois.nic.alsace",
     "alstom": "whois.nic.alstom",
@@ -101,7 +101,7 @@
     "azure": "whois.nic.azure",
     "ba": null,
     "baby": "whois.nic.baby",
-    "baidu": "whois.gtld.knet.cn",
+    "baidu": "whois.nic.baidu",
     "banamex": "whois.nic.banamex",
     "bananarepublic": null,
     "band": "whois.nic.band",
@@ -132,11 +132,11 @@
     "best": "whois.nic.best",
     "bestbuy": "whois.nic.bestbuy",
     "bet": "whois.nic.bet",
-    "bf": null,
+    "bf": "whois.registre.bf",
     "bg": null,
     "bh": "whois.nic.bh",
     "bharti": "whois.nic.bharti",
-    "bi": "whois1.nic.bi",
+    "bi": "whois.nic.bi",
     "bible": "whois.nic.bible",
     "bid": "whois.nic.bid",
     "bike": "whois.nic.bike",
@@ -163,7 +163,7 @@
     "boats": "whois.nic.boats",
     "boehringer": "whois.nic.boehringer",
     "bofa": "whois.nic.bofa",
-    "bom": "whois.gtlds.nic.br",
+    "bom": "whois.nic.bom",
     "bond": "whois.nic.bond",
     "boo": "whois.nic.google",
     "book": "whois.nic.book",
@@ -176,7 +176,7 @@
     "boutique": "whois.nic.boutique",
     "box": "whois.nic.box",
     "bq": null,
-    "br": "whois.nic.br",
+    "br": "whois.registro.br",
     "bradesco": "whois.nic.bradesco",
     "bridgestone": "whois.nic.bridgestone",
     "broadway": "whois.nic.broadway",
@@ -193,8 +193,8 @@
     "buy": "whois.nic.buy",
     "buzz": "whois.nic.buzz",
     "bv": null,
-    "bw": "whois.nic.net.bw",
-    "by": null,
+    "bw": null,
+    "by": "whois.cctld.by",
     "bz": null,
     "bzh": "whois.nic.bzh",
     "ca": "whois.cira.ca",
@@ -231,7 +231,7 @@
     "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",
@@ -241,7 +241,7 @@
     "cfa": "whois.nic.cfa",
     "cfd": "whois.nic.cfd",
     "cg": null,
-    "ch": null,
+    "ch": "whois.nic.ch",
     "chanel": "whois.nic.chanel",
     "channel": "whois.nic.google",
     "charity": "whois.nic.charity",
@@ -275,13 +275,13 @@
     "club": "whois.nic.club",
     "clubmed": "whois.nic.clubmed",
     "cm": "whois.netcom.cm",
-    "cn": null,
+    "cn": "whois.cnnic.cn",
     "co": "whois.nic.co",
     "coach": "whois.nic.coach",
     "codes": "whois.nic.codes",
     "coffee": "whois.nic.coffee",
     "college": "whois.nic.college",
-    "cologne": "whois.nic.cologne",
+    "cologne": "whois.ryce-rsp.com",
     "com": "whois.verisign-grs.com",
     "comcast": null,
     "commbank": "whois.nic.commbank",
@@ -330,8 +330,8 @@
     "data": "whois.nic.data",
     "date": "whois.nic.date",
     "dating": "whois.nic.dating",
-    "datsun": "whois.nic.gmo",
-    "day": "whois.nic.google",
+    "datsun": "whois.nic.datsun",
+    "day": "whois.nic.day",
     "dclk": "whois.nic.google",
     "dds": "whois.nic.dds",
     "de": "whois.denic.de",
@@ -360,8 +360,8 @@
     "dish": "whois.nic.dish",
     "diy": "whois.nic.diy",
     "dj": null,
-    "dk": "whois.punktum.dk",
-    "dm": "whois.dmdomains.dm",
+    "dk": "whois.nic.dk",
+    "dm": "whois.nic.dm",
     "dnp": "whois.nic.dnp",
     "do": "whois.nic.do",
     "docs": "whois.nic.google",
@@ -373,7 +373,7 @@
     "doosan": null,
     "dot": "whois.nic.dot",
     "download": "whois.nic.download",
-    "drive": "whois.nic.google",
+    "drive": "whois.nic.drive",
     "dtv": "whois.nic.dtv",
     "dubai": "whois.nic.dubai",
     "duck": null,
@@ -383,7 +383,7 @@
     "durban": "whois.nic.durban",
     "dvag": "whois.nic.dvag",
     "dvr": "whois.nic.dvr",
-    "dz": null,
+    "dz": "whois.nic.dz",
     "earth": "whois.nic.earth",
     "eat": "whois.nic.google",
     "ec": "whois.nic.ec",
@@ -391,7 +391,7 @@
     "edeka": "whois.nic.edeka",
     "edu": "whois.educause.edu",
     "education": "whois.nic.education",
-    "ee": "whois.tld.ee",
+    "ee": null,
     "eg": null,
     "eh": null,
     "email": "whois.nic.email",
@@ -412,7 +412,7 @@
     "esurance": null,
     "et": null,
     "etisalat": null,
-    "eu": "whois.eu",
+    "eu": null,
     "eurovision": "whois.nic.eurovision",
     "eus": "whois.nic.eus",
     "events": "whois.nic.events",
@@ -442,7 +442,7 @@
     "fidelity": "whois.nic.fidelity",
     "fido": "whois.nic.fido",
     "film": "whois.nic.film",
-    "final": "whois.nic.final",
+    "final": "whois.gtlds.nic.br",
     "finance": "whois.nic.finance",
     "financial": "whois.nic.financial",
     "fire": "whois.nic.fire",
@@ -463,7 +463,7 @@
     "fly": "whois.nic.fly",
     "fm": "whois.nic.fm",
     "fo": "whois.nic.fo",
-    "foo": "whois.nic.google",
+    "foo": "whois.nic.foo",
     "food": "whois.nic.food",
     "foodnetwork": null,
     "football": "whois.nic.football",
@@ -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",
@@ -508,11 +508,11 @@
     "genting": "whois.nic.genting",
     "george": "whois.nic.george",
     "gf": "whois.mediaserv.net",
-    "gg": "whois.gg",
+    "gg": null,
     "ggee": "whois.nic.ggee",
     "gh": "whois.nic.gh",
     "gi": "whois.identitydigital.services",
-    "gift": "whois.nic.gift",
+    "gift": "whois.uniregistry.net",
     "gifts": "whois.nic.gifts",
     "gives": "whois.nic.gives",
     "giving": "whois.nic.giving",
@@ -527,7 +527,7 @@
     "gmbh": "whois.nic.gmbh",
     "gmo": "whois.nic.gmo",
     "gmx": "whois.nic.gmx",
-    "gn": "whois.ande.gov.gn",
+    "gn": null,
     "godaddy": "whois.nic.godaddy",
     "gold": "whois.nic.gold",
     "goldpoint": "whois.nic.goldpoint",
@@ -535,16 +535,16 @@
     "goo": "whois.nic.gmo",
     "goodhands": null,
     "goodyear": "whois.nic.goodyear",
-    "goog": "whois.nic.goog",
+    "goog": "whois.nic.google",
     "google": "whois.nic.google",
     "gop": "whois.nic.gop",
     "got": "whois.nic.got",
-    "gov": "whois.dotgov.gov",
-    "gp": "whois.nic.gp",
-    "gq": "whois.dominio.gq",
+    "gov": "whois.nic.gov",
+    "gp": null,
+    "gq": null,
     "gr": null,
     "grainger": "whois.nic.grainger",
-    "graphics": null,
+    "graphics": "whois.nic.graphics",
     "gratis": "whois.nic.gratis",
     "green": "whois.nic.green",
     "gripe": "whois.nic.gripe",
@@ -560,10 +560,10 @@
     "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": null,
+    "hangout": "whois.nic.hangout",
     "haus": "whois.nic.haus",
     "hbo": "whois.nic.hbo",
     "hdfc": "whois.nic.hdfc",
@@ -572,14 +572,14 @@
     "healthcare": "whois.nic.healthcare",
     "help": "whois.nic.help",
     "helsinki": "whois.nic.helsinki",
-    "here": "whois.nic.google",
+    "here": null,
     "hermes": "whois.nic.hermes",
     "hgtv": null,
     "hiphop": "whois.nic.hiphop",
-    "hisamitsu": "whois.nic.hisamitsu",
-    "hitachi": "whois.nic.hitachi",
+    "hisamitsu": "whois.nic.gmo",
+    "hitachi": "whois.nic.gmo",
     "hiv": "whois.nic.hiv",
-    "hk": "whois.hkirc.hk",
+    "hk": null,
     "hkt": "whois.nic.hkt",
     "hm": "whois.registry.hm",
     "hn": "whois.nic.hn",
@@ -614,13 +614,13 @@
     "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",
@@ -629,24 +629,24 @@
     "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": null,
+    "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",
     "investments": "whois.nic.investments",
     "io": "whois.nic.io",
     "ipiranga": "whois.nic.ipiranga",
-    "iq": "whois.cmc.iq",
+    "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",
@@ -658,9 +658,9 @@
     "iwc": null,
     "jaguar": "whois.nic.jaguar",
     "java": "whois.nic.java",
-    "jcb": "whois.nic.jcb",
+    "jcb": "whois.nic.gmo",
     "jcp": null,
-    "je": null,
+    "je": "whois.je",
     "jeep": "whois.nic.jeep",
     "jetzt": "whois.nic.jetzt",
     "jewelry": "whois.nic.jewelry",
@@ -678,16 +678,16 @@
     "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",
-    "ke": null,
+    "ke": "whois.kenic.or.ke",
     "kerryhotels": "whois.nic.kerryhotels",
     "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,13 +699,13 @@
     "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,
     "kpmg": "whois.nic.kpmg",
     "kpn": "whois.nic.kpn",
-    "kr": null,
+    "kr": "whois.kr",
     "krd": "whois.nic.krd",
     "kred": "whois.nic.kred",
     "kuokgroup": "whois.nic.kuokgroup",
@@ -713,7 +713,7 @@
     "ky": "whois.kyregistry.ky",
     "kyoto": "whois.nic.kyoto",
     "kz": "whois.nic.kz",
-    "la": "whois.nic.la",
+    "la": null,
     "lacaixa": "whois.nic.lacaixa",
     "ladbrokes": null,
     "lamborghini": "whois.nic.lamborghini",
@@ -730,7 +730,7 @@
     "latrobe": "whois.nic.latrobe",
     "law": "whois.nic.law",
     "lawyer": "whois.nic.lawyer",
-    "lb": null,
+    "lb": "whois.lbdr.org.lb",
     "lc": null,
     "lds": "whois.nic.lds",
     "lease": "whois.nic.lease",
@@ -746,14 +746,14 @@
     "life": "whois.nic.life",
     "lifeinsurance": "whois.nic.lifeinsurance",
     "lifestyle": "whois.nic.lifestyle",
-    "lighting": null,
+    "lighting": "whois.nic.lighting",
     "like": "whois.nic.like",
     "lilly": "whois.nic.lilly",
     "limited": "whois.nic.limited",
     "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",
@@ -775,7 +775,7 @@
     "lplfinancial": "whois.nic.lplfinancial",
     "lr": null,
     "ls": "whois.nic.ls",
-    "lt": null,
+    "lt": "whois.domreg.lt",
     "ltd": "whois.nic.ltd",
     "ltda": "whois.nic.ltda",
     "lu": "whois.dns.lu",
@@ -785,7 +785,7 @@
     "luxury": "whois.nic.luxury",
     "lv": "whois.nic.lv",
     "ly": "whois.nic.ly",
-    "ma": null,
+    "ma": "whois.registre.ma",
     "macys": null,
     "madrid": "whois.nic.madrid",
     "maif": "whois.nic.maif",
@@ -834,7 +834,7 @@
     "ml": "whois.nic.ml",
     "mlb": "whois.nic.mlb",
     "mls": "whois.nic.mls",
-    "mm": "whois.registry.gov.mm",
+    "mm": null,
     "mma": "whois.nic.mma",
     "mn": "whois.nic.mn",
     "mo": "whois.monic.mo",
@@ -855,12 +855,12 @@
     "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,
-    "mq": "whois.mediaserv.net",
-    "mr": "whois.nic.mr",
+    "mq": "whois.nic.mq",
+    "mr": null,
     "ms": "whois.nic.ms",
     "msd": "whois.nic.msd",
     "mt": null,
@@ -889,7 +889,7 @@
     "nc": null,
     "ne": null,
     "nec": "whois.nic.nec",
-    "net": "whois.verisign-grs.com",
+    "net": null,
     "netbank": "whois.nic.netbank",
     "netflix": "whois.nic.netflix",
     "network": "whois.nic.network",
@@ -902,7 +902,7 @@
     "nexus": "whois.nic.google",
     "nf": "whois.nic.nf",
     "nfl": "whois.nic.nfl",
-    "ng": null,
+    "ng": "whois.nic.net.ng",
     "ngo": "whois.nic.ngo",
     "nhk": "whois.nic.nhk",
     "ni": null,
@@ -910,7 +910,7 @@
     "nike": "whois.nic.nike",
     "nikon": "whois.nic.nikon",
     "ninja": "whois.nic.ninja",
-    "nissan": "whois.nic.gmo",
+    "nissan": "whois.nic.nissan",
     "nissay": "whois.nic.nissay",
     "nl": "whois.domain-registry.nl",
     "no": "whois.norid.no",
@@ -925,9 +925,9 @@
     "nra": "whois.nic.nra",
     "nrw": "whois.nic.nrw",
     "ntt": "whois.nic.ntt",
-    "nu": null,
+    "nu": "whois.iis.nu",
     "nyc": "whois.nic.nyc",
-    "nz": null,
+    "nz": "whois.irs.net.nz",
     "obi": "whois.nic.obi",
     "observer": "whois.nic.observer",
     "off": null,
@@ -937,7 +937,7 @@
     "olayangroup": "whois.nic.olayangroup",
     "oldnavy": null,
     "ollo": "whois.nic.ollo",
-    "om": "whois.registry.om",
+    "om": null,
     "omega": "whois.nic.omega",
     "one": "whois.nic.one",
     "ong": "whois.nic.ong",
@@ -948,7 +948,7 @@
     "open": "whois.nic.open",
     "oracle": "whois.nic.oracle",
     "orange": "whois.nic.orange",
-    "org": null,
+    "org": "whois.publicinterestregistry.org",
     "organic": "whois.nic.organic",
     "orientexpress": null,
     "origins": "whois.nic.origins",
@@ -957,9 +957,9 @@
     "ott": "whois.nic.ott",
     "ovh": "whois.nic.ovh",
     "pa": null,
-    "page": "whois.nic.google",
+    "page": "whois.nic.page",
     "pamperedchef": null,
-    "panasonic": "whois.nic.gmo",
+    "panasonic": "whois.nic.panasonic",
     "panerai": null,
     "paris": "whois.nic.paris",
     "pars": "whois.nic.pars",
@@ -969,7 +969,7 @@
     "passagens": null,
     "pay": "whois.nic.pay",
     "pccw": "whois.nic.pccw",
-    "pe": "whois.nic.pe",
+    "pe": "kero.yachay.pe",
     "pet": "whois.nic.pet",
     "pf": null,
     "pfizer": "whois.nic.pfizer",
@@ -996,7 +996,7 @@
     "pk": "whois.pknic.net.pk",
     "pl": "whois.dns.pl",
     "place": "whois.nic.place",
-    "play": "whois.nic.google",
+    "play": "whois.nic.play",
     "playstation": "whois.nic.playstation",
     "plumbing": "whois.nic.plumbing",
     "plus": "whois.nic.plus",
@@ -1025,12 +1025,12 @@
     "pru": "whois.nic.pru",
     "prudential": "whois.nic.prudential",
     "ps": null,
-    "pt": "whois.dns.pt",
+    "pt": null,
     "pub": "whois.nic.pub",
     "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",
@@ -1056,19 +1056,19 @@
     "rent": "whois.nic.rent",
     "rentals": "whois.nic.rentals",
     "repair": "whois.nic.repair",
-    "report": "whois.nic.report",
+    "report": null,
     "republican": "whois.nic.republican",
     "rest": "whois.nic.rest",
     "restaurant": "whois.nic.restaurant",
     "review": "whois.nic.review",
     "reviews": "whois.nic.reviews",
     "rexroth": "whois.nic.rexroth",
-    "rich": "whois.nic.rich",
-    "richardli": "whois.nic.richardli",
+    "rich": null,
+    "richardli": null,
     "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",
@@ -1077,7 +1077,7 @@
     "rodeo": "whois.nic.rodeo",
     "rogers": "whois.nic.rogers",
     "room": "whois.nic.room",
-    "rs": null,
+    "rs": "whois.rnids.rs",
     "rsvp": "whois.nic.rsvp",
     "ru": "whois.nic.ru",
     "rugby": "whois.nic.rugby",
@@ -1086,7 +1086,7 @@
     "rw": "whois.nic.rw",
     "rwe": "whois.nic.rwe",
     "ryukyu": "whois.nic.ryukyu",
-    "sa": "whois.nic.net.sa",
+    "sa": "whois.nic.sa",
     "saarland": "whois.nic.saarland",
     "safe": "whois.nic.safe",
     "safety": "whois.nic.safety",
@@ -1104,7 +1104,7 @@
     "sas": "whois.nic.sas",
     "save": "whois.nic.save",
     "saxo": "whois.nic.saxo",
-    "sb": "whois.nic.sb",
+    "sb": "whois.nic.net.sb",
     "sbi": "whois.nic.sbi",
     "sbs": "whois.nic.sbs",
     "sc": "whois.nic.sc",
@@ -1128,7 +1128,7 @@
     "security": "whois.nic.security",
     "seek": "whois.nic.seek",
     "select": "whois.nic.select",
-    "sener": "whois.nic.rwe",
+    "sener": "whois.nic.sener",
     "services": "whois.nic.services",
     "ses": null,
     "seven": "whois.nic.seven",
@@ -1147,7 +1147,7 @@
     "shoes": "whois.nic.shoes",
     "shop": "whois.nic.shop",
     "shopping": "whois.nic.shopping",
-    "shouji": "whois.teleinfo.cn",
+    "shouji": "whois.nic.shouji",
     "show": "whois.nic.show",
     "showtime": null,
     "shriram": null,
@@ -1179,7 +1179,7 @@
     "solutions": "whois.nic.solutions",
     "song": "whois.nic.song",
     "sony": "whois.nic.sony",
-    "soy": "whois.nic.google",
+    "soy": "whois.nic.soy",
     "spa": "whois.nic.spa",
     "space": "whois.nic.space",
     "spiegel": null,
@@ -1207,7 +1207,7 @@
     "studio": "whois.nic.studio",
     "study": "whois.nic.study",
     "style": "whois.nic.style",
-    "su": null,
+    "su": "whois.tcinet.ru",
     "sucks": "whois.nic.sucks",
     "supplies": "whois.nic.supplies",
     "supply": "whois.nic.supply",
@@ -1250,7 +1250,7 @@
     "teva": "whois.nic.teva",
     "tf": "whois.nic.tf",
     "tg": "whois.nic.tg",
-    "th": null,
+    "th": "whois.thnic.co.th",
     "thd": "whois.nic.thd",
     "theater": "whois.nic.theater",
     "theatre": "whois.nic.theatre",
@@ -1264,9 +1264,9 @@
     "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": "whois.ati.tn",
@@ -1302,7 +1302,7 @@
     "tvs": "whois.nic.tvs",
     "tw": null,
     "tz": null,
-    "ua": null,
+    "ua": "whois.ua",
     "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": "whois.nic.org.uy",
-    "uz": "whois.cctld.uz",
+    "uy": null,
+    "uz": null,
     "va": null,
     "vacations": "whois.nic.vacations",
     "vana": "whois.nic.vana",
     "vanguard": "whois.nic.vanguard",
-    "vc": "whois.identitydigital.services",
+    "vc": null,
     "ve": "whois.nic.ve",
     "vegas": "whois.nic.vegas",
     "ventures": "whois.nic.ventures",
@@ -1329,7 +1329,7 @@
     "versicherung": "whois.nic.versicherung",
     "vet": "whois.nic.vet",
     "vg": "whois.nic.vg",
-    "vi": "virgil.nic.vi",
+    "vi": "whois.nic.vi",
     "viajes": "whois.nic.viajes",
     "video": "whois.nic.video",
     "vig": "whois.nic.vig",
@@ -1353,7 +1353,7 @@
     "voting": "whois.nic.voting",
     "voto": "whois.nic.voto",
     "voyage": "whois.nic.voyage",
-    "vu": null,
+    "vu": "whois.dnrs.vu",
     "vuelos": null,
     "wales": "whois.nic.wales",
     "walmart": "whois.nic.walmart",
@@ -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,24 +1400,24 @@
     "xn--11b4c3d": "whois.nic.xn--11b4c3d",
     "xn--11b5bs3a9aj6g": null,
     "xn--1ck2e1b": "whois.nic.xn--1ck2e1b",
-    "xn--1qqw23a": "whois.ngtld.cn",
-    "xn--2scrj9c": "whois.registry.in",
+    "xn--1qqw23a": "whois.nic.xn--1qqw23a",
+    "xn--2scrj9c": null,
     "xn--30rr7y": "whois.nic.xn--30rr7y",
-    "xn--3bst00m": "whois.gtld.knet.cn",
-    "xn--3ds443g": "whois.teleinfo.cn",
+    "xn--3bst00m": "whois.nic.xn--3bst00m",
+    "xn--3ds443g": "whois.nic.xn--3ds443g",
     "xn--3e0b707e": "whois.kr",
-    "xn--3hcrj9c": null,
+    "xn--3hcrj9c": "whois.registry.in",
     "xn--3oq18vl8pn36a": null,
     "xn--3pxu8k": "whois.nic.xn--3pxu8k",
     "xn--42c2d9a": "whois.nic.xn--42c2d9a",
-    "xn--45br5cyl": null,
-    "xn--45brj9c": null,
-    "xn--45q11c": "whois.nic.xn--45q11c",
-    "xn--4dbrk0ce": null,
+    "xn--45br5cyl": "whois.registry.in",
+    "xn--45brj9c": "whois.registry.in",
+    "xn--45q11c": "whois.gtld.knet.cn",
+    "xn--4dbrk0ce": "whois.isoc.org.il",
     "xn--4gbrim": "whois.nic.xn--4gbrim",
     "xn--54b7fta0cc": null,
-    "xn--55qw42g": "whois.conac.cn",
-    "xn--55qx5d": "whois.ngtld.cn",
+    "xn--55qw42g": "whois.nic.xn--55qw42g",
+    "xn--55qx5d": "whois.nic.xn--55qx5d",
     "xn--5su34j936bgsg": "whois.nic.xn--5su34j936bgsg",
     "xn--5tzm5g": "whois.nic.xn--5tzm5g",
     "xn--6frz82g": "whois.nic.xn--6frz82g",
@@ -1429,7 +1429,7 @@
     "xn--80asehdb": "whois.nic.xn--80asehdb",
     "xn--80aswg": "whois.nic.xn--80aswg",
     "xn--8y0a063a": "whois.nic.xn--8y0a063a",
-    "xn--90a3ac": "whois.rnids.rs",
+    "xn--90a3ac": null,
     "xn--90ae": "whois.imena.bg",
     "xn--90ais": "whois.cctld.by",
     "xn--9dbq2a": "whois.nic.xn--9dbq2a",
@@ -1442,7 +1442,7 @@
     "xn--c2br7g": "whois.nic.xn--c2br7g",
     "xn--cck2b3b": "whois.nic.xn--cck2b3b",
     "xn--cckwcxetd": "whois.nic.xn--cckwcxetd",
-    "xn--cg4bki": "whois.kr",
+    "xn--cg4bki": "whois.nic.xn--cg4bki",
     "xn--clchc0ea0b2g2a9gcd": "whois.ta.sgnic.sg",
     "xn--czr694b": "whois.nic.xn--czr694b",
     "xn--czrs0t": "whois.nic.xn--czrs0t",
@@ -1458,27 +1458,27 @@
     "xn--fhbei": "whois.nic.xn--fhbei",
     "xn--fiq228c5hs": "whois.nic.xn--fiq228c5hs",
     "xn--fiq64b": "whois.nic.xn--fiq64b",
-    "xn--fiqs8s": "cwhois.cnnic.cn",
-    "xn--fiqz9s": "cwhois.cnnic.cn",
+    "xn--fiqs8s": null,
+    "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",
     "xn--g6w251d": null,
     "xn--gckr3f0f": "whois.nic.xn--gckr3f0f",
-    "xn--gecrj9c": null,
+    "xn--gecrj9c": "whois.registry.in",
     "xn--gk3at1e": "whois.nic.xn--gk3at1e",
     "xn--h2breg3eve": "whois.registry.in",
-    "xn--h2brj9c": null,
-    "xn--h2brj9c8c": null,
+    "xn--h2brj9c": "whois.registry.in",
+    "xn--h2brj9c8c": "whois.registry.in",
     "xn--hgbk6aj7f53bba": null,
     "xn--hlcj6aya9esc7a": null,
     "xn--hxt814e": "whois.gtld.knet.cn",
     "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": "whois.dotukr.com",
     "xn--j6w193g": "whois.hkirc.hk",
@@ -1488,15 +1488,15 @@
     "xn--jxalpdlp": null,
     "xn--kcrx77d1x4a": "whois.nic.xn--kcrx77d1x4a",
     "xn--kgbechtv": null,
-    "xn--kprw13d": "whois.twnic.net.tw",
-    "xn--kpry57d": "whois.twnic.net.tw",
+    "xn--kprw13d": null,
+    "xn--kpry57d": null,
     "xn--kpu716f": null,
     "xn--kput3i": "whois.nic.xn--kput3i",
     "xn--l1acc": null,
     "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": "whois.aeda.net.ae",
@@ -1506,11 +1506,11 @@
     "xn--mgbayh7gpa": null,
     "xn--mgbb9fbpob": null,
     "xn--mgbbh1a": "whois.registry.in",
-    "xn--mgbbh1a71e": "whois.registry.in",
+    "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,
@@ -1552,7 +1552,7 @@
     "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.teleinfo.cn",
+    "xn--vuq861b": "whois.nic.xn--vuq861b",
     "xn--w4r85el8fhu5dnra": "whois.nic.xn--w4r85el8fhu5dnra",
     "xn--w4rs40l": "whois.nic.xn--w4rs40l",
     "xn--wgbh1c": "whois.dotmasr.eg",
@@ -1560,9 +1560,9 @@
     "xn--xhq521b": "whois.ngtld.cn",
     "xn--xkc2al3hye2a": null,
     "xn--xkc2dl3a5ee0h": "whois.registry.in",
-    "xn--y9a3aq": null,
-    "xn--yfro4i67o": null,
-    "xn--ygbi2ammx": null,
+    "xn--y9a3aq": "whois.amnic.net",
+    "xn--yfro4i67o": "whois.zh.sgnic.sg",
+    "xn--ygbi2ammx": "whois.pnina.ps",
     "xn--zckzah": null,
     "xn--zfr164b": "whois.nic.xn--zfr164b",
     "xperia": null,
@@ -1579,14 +1579,14 @@
     "you": "whois.nic.you",
     "youtube": "whois.nic.google",
     "yt": "whois.nic.yt",
-    "yun": "whois.nic.yun",
+    "yun": "whois.teleinfo.cn",
     "za": "whois.nic.za",
     "zappos": "whois.nic.zappos",
     "zara": "whois.nic.zara",
     "zero": "whois.nic.zero",
     "zip": "whois.nic.google",
     "zippo": null,
-    "zm": "whois.zicta.zm",
+    "zm": "whois.nic.zm",
     "zone": "whois.nic.zone",
     "zuerich": "whois.nic.zuerich",
     "zw": null