diff --git a/iana-domains-db.json b/iana-domains-db.json
index 4c3cda1c..6d2c519a 100644
--- a/iana-domains-db.json
+++ b/iana-domains-db.json
@@ -64,7 +64,7 @@
     "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",
@@ -132,8 +132,8 @@
     "best": "whois.nic.best",
     "bestbuy": "whois.nic.bestbuy",
     "bet": "whois.nic.bet",
-    "bf": null,
-    "bg": null,
+    "bf": "whois.registre.bf",
+    "bg": "whois.register.bg",
     "bh": "whois.nic.bh",
     "bharti": "whois.nic.bharti",
     "bi": "whois1.nic.bi",
@@ -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.boo",
     "book": "whois.nic.book",
@@ -197,10 +197,10 @@
     "by": "whois.cctld.by",
     "bz": null,
     "bzh": "whois.nic.bzh",
-    "ca": null,
+    "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",
@@ -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.ryce-rsp.com",
-    "com": null,
+    "com": "whois.verisign-grs.com",
     "comcast": null,
     "commbank": "whois.nic.commbank",
     "community": "whois.nic.community",
@@ -325,16 +325,16 @@
     "cyou": "whois.nic.cyou",
     "cz": "whois.nic.cz",
     "dabur": null,
-    "dad": "whois.nic.dad",
+    "dad": "whois.nic.google",
     "dance": "whois.nic.dance",
     "data": "whois.nic.data",
     "date": "whois.nic.date",
     "dating": "whois.nic.dating",
-    "datsun": "whois.nic.gmo",
-    "day": "whois.nic.google",
-    "dclk": "whois.nic.google",
+    "datsun": "whois.nic.datsun",
+    "day": "whois.nic.day",
+    "dclk": "whois.nic.dclk",
     "dds": "whois.nic.dds",
-    "de": "whois.denic.de",
+    "de": "whois.nic.de",
     "deal": "whois.nic.deal",
     "dealer": "whois.nic.dealer",
     "deals": "whois.nic.deals",
@@ -348,9 +348,9 @@
     "dentist": "whois.nic.dentist",
     "desi": "whois.nic.desi",
     "design": "whois.nic.design",
-    "dev": "whois.nic.google",
+    "dev": "whois.nic.dev",
     "dhl": "whois.nic.dhl",
-    "diamonds": "whois.nic.diamonds",
+    "diamonds": null,
     "diet": "whois.nic.diet",
     "digital": "whois.nic.digital",
     "direct": "whois.nic.direct",
@@ -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",
@@ -383,10 +383,10 @@
     "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",
+    "ec": null,
     "eco": "whois.nic.eco",
     "edeka": "whois.nic.edeka",
     "edu": "whois.educause.edu",
@@ -437,12 +437,12 @@
     "feedback": "whois.nic.feedback",
     "ferrari": "whois.nic.ferrari",
     "ferrero": "whois.nic.ferrero",
-    "fi": "whois.fi",
+    "fi": null,
     "fiat": null,
     "fidelity": "whois.nic.fidelity",
-    "fido": "whois.nic.fido",
+    "fido": null,
     "film": "whois.nic.film",
-    "final": "whois.gtlds.nic.br",
+    "final": "whois.nic.final",
     "finance": "whois.nic.finance",
     "financial": "whois.nic.financial",
     "fire": "whois.nic.fire",
@@ -452,7 +452,7 @@
     "fishing": "whois.nic.fishing",
     "fit": "whois.nic.fit",
     "fitness": "whois.nic.fitness",
-    "fj": null,
+    "fj": "www.whois.fj",
     "fk": null,
     "flickr": "whois.nic.flickr",
     "flights": "whois.nic.flights",
@@ -499,7 +499,7 @@
     "garden": "whois.nic.garden",
     "gay": "whois.nic.gay",
     "gb": null,
-    "gbiz": "whois.nic.gbiz",
+    "gbiz": "whois.nic.google",
     "gd": "whois.nic.gd",
     "gdn": "whois.nic.gdn",
     "ge": "whois.nic.ge",
@@ -512,7 +512,7 @@
     "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",
@@ -521,7 +521,7 @@
     "glass": "whois.nic.glass",
     "gle": "whois.nic.google",
     "global": "whois.nic.global",
-    "globo": "whois.gtlds.nic.br",
+    "globo": "whois.nic.globo",
     "gm": null,
     "gmail": "whois.nic.gmail",
     "gmbh": "whois.nic.gmbh",
@@ -539,9 +539,9 @@
     "google": "whois.nic.google",
     "gop": "whois.nic.gop",
     "got": "whois.nic.got",
-    "gov": "whois.nic.gov",
+    "gov": "whois.dotgov.gov",
     "gp": "whois.nic.gp",
-    "gq": null,
+    "gq": "whois.dominio.gq",
     "gr": null,
     "grainger": "whois.nic.grainger",
     "graphics": "whois.nic.graphics",
@@ -555,7 +555,7 @@
     "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",
@@ -563,7 +563,7 @@
     "gy": null,
     "hair": "whois.nic.hair",
     "hamburg": "whois.nic.hamburg",
-    "hangout": "whois.nic.hangout",
+    "hangout": "whois.nic.google",
     "haus": "whois.nic.haus",
     "hbo": "whois.nic.hbo",
     "hdfc": "whois.nic.hdfc",
@@ -579,9 +579,9 @@
     "hisamitsu": "whois.nic.hisamitsu",
     "hitachi": "whois.nic.hitachi",
     "hiv": "whois.nic.hiv",
-    "hk": "whois.hkirc.hk",
+    "hk": null,
     "hkt": "whois.nic.hkt",
-    "hm": "whois.registry.hm",
+    "hm": null,
     "hn": "whois.nic.hn",
     "hockey": "whois.nic.hockey",
     "holdings": "whois.nic.holdings",
@@ -601,8 +601,8 @@
     "hotels": "whois.nic.hotels",
     "hotmail": "whois.nic.hotmail",
     "house": "whois.nic.house",
-    "how": "whois.nic.google",
-    "hr": "whois.dns.hr",
+    "how": "whois.nic.how",
+    "hr": "whois.nic.hr",
     "hsbc": "whois.nic.hsbc",
     "ht": "whois.nic.ht",
     "htc": null,
@@ -626,12 +626,12 @@
     "imdb": "whois.nic.imdb",
     "immo": "whois.nic.immo",
     "immobilien": "whois.nic.immobilien",
-    "in": "whois.registry.in",
+    "in": null,
     "inc": "whois.nic.inc",
     "industries": "whois.nic.industries",
     "infiniti": "whois.nic.gmo",
     "info": "whois.nic.info",
-    "ing": "whois.nic.google",
+    "ing": null,
     "ink": "whois.nic.ink",
     "institute": "whois.nic.institute",
     "insurance": "whois.nic.insurance",
@@ -660,7 +660,7 @@
     "java": "whois.nic.java",
     "jcb": "whois.nic.jcb",
     "jcp": null,
-    "je": "whois.je",
+    "je": null,
     "jeep": "whois.nic.jeep",
     "jetzt": "whois.nic.jetzt",
     "jewelry": "whois.nic.jewelry",
@@ -675,19 +675,19 @@
     "joburg": "whois.nic.joburg",
     "jot": "whois.nic.jot",
     "joy": "whois.nic.joy",
-    "jp": "whois.jprs.jp",
+    "jp": null,
     "jpmorgan": "whois.nic.jpmorgan",
     "jprs": "whois.nic.jprs",
     "juegos": "whois.uniregistry.net",
     "juniper": "whois.nic.juniper",
     "kaufen": "whois.nic.kaufen",
     "kddi": "whois.nic.kddi",
-    "ke": "whois.kenic.or.ke",
+    "ke": null,
     "kerryhotels": "whois.nic.kerryhotels",
     "kerrylogistics": "whois.nic.kerrylogistics",
     "kerryproperties": "whois.nic.kerryproperties",
     "kfh": "whois.nic.kfh",
-    "kg": null,
+    "kg": "whois.kg",
     "kh": null,
     "ki": "whois.nic.ki",
     "kia": "whois.nic.kia",
@@ -705,7 +705,7 @@
     "kp": null,
     "kpmg": "whois.nic.kpmg",
     "kpn": "whois.nic.kpn",
-    "kr": "whois.kr",
+    "kr": null,
     "krd": "whois.nic.krd",
     "kred": "whois.nic.kred",
     "kuokgroup": "whois.nic.kuokgroup",
@@ -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",
@@ -778,14 +778,14 @@
     "lt": "whois.domreg.lt",
     "ltd": "whois.nic.ltd",
     "ltda": "whois.nic.ltda",
-    "lu": "whois.dns.lu",
+    "lu": null,
     "lundbeck": "whois.nic.lundbeck",
     "lupin": null,
     "luxe": "whois.nic.luxe",
     "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",
@@ -813,7 +813,7 @@
     "media": "whois.nic.media",
     "meet": "whois.nic.meet",
     "melbourne": "whois.nic.melbourne",
-    "meme": "whois.nic.google",
+    "meme": "whois.nic.meme",
     "memorial": "whois.nic.memorial",
     "men": "whois.nic.men",
     "menu": "whois.nic.menu",
@@ -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": null,
@@ -874,7 +874,7 @@
     "mutuelle": null,
     "mv": null,
     "mw": "whois.nic.mw",
-    "mx": null,
+    "mx": "whois.mx",
     "my": "whois.mynic.my",
     "mz": "whois.nic.mz",
     "na": null,
@@ -886,7 +886,7 @@
     "natura": null,
     "navy": "whois.nic.navy",
     "nba": "whois.nic.nba",
-    "nc": null,
+    "nc": "whois.nc",
     "ne": null,
     "nec": "whois.nic.nec",
     "net": null,
@@ -912,8 +912,8 @@
     "ninja": "whois.nic.ninja",
     "nissan": "whois.nic.nissan",
     "nissay": "whois.nic.nissay",
-    "nl": null,
-    "no": null,
+    "nl": "whois.domain-registry.nl",
+    "no": "whois.norid.no",
     "nokia": "whois.nic.nokia",
     "northwesternmutual": null,
     "norton": "whois.nic.norton",
@@ -925,9 +925,9 @@
     "nra": "whois.nic.nra",
     "nrw": "whois.nic.nrw",
     "ntt": "whois.nic.ntt",
-    "nu": "whois.iis.nu",
+    "nu": null,
     "nyc": "whois.nic.nyc",
-    "nz": "whois.irs.net.nz",
+    "nz": null,
     "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": null,
+    "om": "whois.registry.om",
     "omega": "whois.nic.omega",
     "one": "whois.nic.one",
     "ong": "whois.nic.ong",
@@ -969,14 +969,14 @@
     "passagens": null,
     "pay": "whois.nic.pay",
     "pccw": "whois.nic.pccw",
-    "pe": "whois.nic.pe",
+    "pe": "kero.yachay.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.google",
+    "phd": "whois.nic.phd",
     "philips": "whois.nic.philips",
     "phone": "whois.nic.phone",
     "photo": "whois.nic.photo",
@@ -993,10 +993,10 @@
     "pink": "whois.nic.pink",
     "pioneer": "whois.nic.pioneer",
     "pizza": "whois.nic.pizza",
-    "pk": "whois.pknic.net.pk",
-    "pl": "whois.dns.pl",
+    "pk": null,
+    "pl": null,
     "place": "whois.nic.place",
-    "play": "whois.nic.google",
+    "play": "whois.nic.play",
     "playstation": "whois.nic.playstation",
     "plumbing": "whois.nic.plumbing",
     "plus": "whois.nic.plus",
@@ -1008,15 +1008,15 @@
     "politie": "whois.nic.politie",
     "porn": "whois.nic.porn",
     "post": "whois.nic.post",
-    "pr": "whois.nic.pr",
+    "pr": "whois.afilias-srs.net",
     "pramerica": "whois.nic.pramerica",
     "praxi": "whois.nic.praxi",
     "press": "whois.nic.press",
     "prime": "whois.nic.prime",
     "pro": "whois.nic.pro",
-    "prod": "whois.nic.prod",
+    "prod": "whois.nic.google",
     "productions": "whois.nic.productions",
-    "prof": "whois.nic.prof",
+    "prof": "whois.nic.google",
     "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": null,
+    "qa": "whois.registry.qa",
     "qpon": "whois.nic.qpon",
     "quebec": "whois.nic.quebec",
     "quest": "whois.nic.quest",
@@ -1071,14 +1071,14 @@
     "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",
+    "rs": null,
+    "rsvp": "whois.nic.rsvp",
     "ru": "whois.nic.ru",
     "rugby": "whois.nic.rugby",
     "ruhr": "whois.nic.ruhr",
@@ -1086,7 +1086,7 @@
     "rw": "whois.ricta.org.rw",
     "rwe": "whois.nic.rwe",
     "ryukyu": "whois.nic.ryukyu",
-    "sa": "whois.nic.sa",
+    "sa": "whois.nic.net.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",
@@ -1121,8 +1121,8 @@
     "scor": null,
     "scot": "whois.nic.scot",
     "sd": "whois.nic.sd",
-    "se": null,
-    "search": "whois.nic.search",
+    "se": "whois.iis.se",
+    "search": "whois.nic.google",
     "seat": "whois.nic.seat",
     "secure": "whois.nic.secure",
     "security": "whois.nic.security",
@@ -1136,10 +1136,10 @@
     "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.gmo",
+    "sharp": "whois.nic.sharp",
     "shaw": "whois.afilias-srs.net",
     "shell": "whois.nic.shell",
     "shia": "whois.nic.shia",
@@ -1151,13 +1151,13 @@
     "show": "whois.nic.show",
     "showtime": null,
     "shriram": null,
-    "si": null,
+    "si": "whois.register.si",
     "silk": "whois.nic.silk",
     "sina": "whois.nic.sina",
     "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",
@@ -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,
@@ -1250,7 +1250,7 @@
     "teva": "whois.nic.teva",
     "tf": "whois.nic.tf",
     "tg": "whois.nic.tg",
-    "th": "whois.thnic.co.th",
+    "th": null,
     "thd": "whois.nic.thd",
     "theater": "whois.nic.theater",
     "theatre": "whois.nic.theatre",
@@ -1264,7 +1264,7 @@
     "tj": null,
     "tjmaxx": "whois.nic.tjmaxx",
     "tjx": "whois.nic.tjx",
-    "tk": "whois.dot.tk",
+    "tk": null,
     "tkmaxx": "whois.nic.tkmaxx",
     "tl": null,
     "tm": "whois.nic.tm",
@@ -1283,7 +1283,7 @@
     "toyota": "whois.nic.toyota",
     "toys": "whois.nic.toys",
     "tp": null,
-    "tr": "whois.nic.tr",
+    "tr": "whois.trabis.gov.tr",
     "trade": "whois.nic.trade",
     "trading": "whois.nic.trading",
     "training": "whois.nic.training",
@@ -1300,13 +1300,13 @@
     "tushu": "whois.nic.tushu",
     "tv": "whois.nic.tv",
     "tvs": "whois.nic.tvs",
-    "tw": null,
-    "tz": "whois.tznic.or.tz",
-    "ua": null,
+    "tw": "whois.twnic.net.tw",
+    "tz": null,
+    "ua": "whois.ua",
     "ubank": "whois.nic.ubank",
     "ubs": "whois.nic.ubs",
     "uconnect": null,
-    "ug": "whois.co.ug",
+    "ug": null,
     "uk": "whois.nic.uk",
     "um": null,
     "unicom": "whois.nic.unicom",
@@ -1315,7 +1315,7 @@
     "uol": "whois.gtlds.nic.br",
     "ups": "whois.nic.ups",
     "us": "whois.nic.us",
-    "uy": null,
+    "uy": "whois.nic.org.uy",
     "uz": "whois.cctld.uz",
     "va": null,
     "vacations": "whois.nic.vacations",
@@ -1329,7 +1329,7 @@
     "versicherung": "whois.nic.versicherung",
     "vet": "whois.nic.vet",
     "vg": "whois.nic.vg",
-    "vi": "whois.nic.vi",
+    "vi": "virgil.nic.vi",
     "viajes": "whois.nic.viajes",
     "video": "whois.nic.video",
     "vig": "whois.nic.vig",
@@ -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",
@@ -1402,18 +1402,18 @@
     "xn--1ck2e1b": "whois.nic.xn--1ck2e1b",
     "xn--1qqw23a": "whois.nic.xn--1qqw23a",
     "xn--2scrj9c": null,
-    "xn--30rr7y": "whois.gtld.knet.cn",
-    "xn--3bst00m": "whois.gtld.knet.cn",
-    "xn--3ds443g": "whois.teleinfo.cn",
+    "xn--30rr7y": "whois.nic.xn--30rr7y",
+    "xn--3bst00m": "whois.nic.xn--3bst00m",
+    "xn--3ds443g": "whois.nic.xn--3ds443g",
     "xn--3e0b707e": null,
-    "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": "whois.registry.in",
     "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",
@@ -1421,19 +1421,19 @@
     "xn--5su34j936bgsg": "whois.nic.xn--5su34j936bgsg",
     "xn--5tzm5g": "whois.nic.xn--5tzm5g",
     "xn--6frz82g": "whois.nic.xn--6frz82g",
-    "xn--6qq986b3xl": "whois.nic.xn--6qq986b3xl",
+    "xn--6qq986b3xl": "whois.gtld.knet.cn",
     "xn--80adxhks": "whois.nic.xn--80adxhks",
     "xn--80akhbyknj4f": null,
-    "xn--80ao21a": null,
+    "xn--80ao21a": "whois.nic.kz",
     "xn--80aqecdr1a": "whois.nic.xn--80aqecdr1a",
     "xn--80asehdb": "whois.nic.xn--80asehdb",
     "xn--80aswg": "whois.nic.xn--80aswg",
     "xn--8y0a063a": "whois.nic.xn--8y0a063a",
     "xn--90a3ac": "whois.rnids.rs",
-    "xn--90ae": "whois.imena.bg",
+    "xn--90ae": null,
     "xn--90ais": "whois.cctld.by",
     "xn--9dbq2a": "whois.nic.xn--9dbq2a",
-    "xn--9et52u": "whois.gtld.knet.cn",
+    "xn--9et52u": "whois.nic.xn--9et52u",
     "xn--9krt00a": "whois.nic.xn--9krt00a",
     "xn--9t4b11yi5a": null,
     "xn--b4w605ferd": "whois.nic.xn--b4w605ferd",
@@ -1470,7 +1470,7 @@
     "xn--gckr3f0f": "whois.nic.xn--gckr3f0f",
     "xn--gecrj9c": "whois.registry.in",
     "xn--gk3at1e": "whois.nic.xn--gk3at1e",
-    "xn--h2breg3eve": null,
+    "xn--h2breg3eve": "whois.registry.in",
     "xn--h2brj9c": "whois.registry.in",
     "xn--h2brj9c8c": "whois.registry.in",
     "xn--hgbk6aj7f53bba": null,
@@ -1478,10 +1478,10 @@
     "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",
+    "xn--j1amh": null,
+    "xn--j6w193g": null,
     "xn--jlq480n2rg": "whois.nic.xn--jlq480n2rg",
     "xn--jlq61u9w7b": null,
     "xn--jvr189m": "whois.nic.xn--jvr189m",
@@ -1499,7 +1499,7 @@
     "xn--mgba3a4f16a": null,
     "xn--mgba7c0bbn0a": "whois.nic.xn--mgba7c0bbn0a",
     "xn--mgbaakc7dvf": null,
-    "xn--mgbaam7a8h": null,
+    "xn--mgbaam7a8h": "whois.aeda.net.ae",
     "xn--mgbab2bd": "whois.nic.xn--mgbab2bd",
     "xn--mgbah1a3hjkrd": "whois.nic.mr",
     "xn--mgbai9azgqp6j": null,
@@ -1535,7 +1535,7 @@
     "xn--pbt977c": null,
     "xn--pgbs0dh": "whois.ati.tn",
     "xn--pssy2u": "whois.nic.xn--pssy2u",
-    "xn--q7ce6a": "whois.nic.la",
+    "xn--q7ce6a": null,
     "xn--q9jyb4c": "whois.nic.google",
     "xn--qcka1pmc": "whois.nic.google",
     "xn--qxa6a": "whois.eu",
@@ -1560,11 +1560,11 @@
     "xn--xhq521b": "whois.ngtld.cn",
     "xn--xkc2al3hye2a": null,
     "xn--xkc2dl3a5ee0h": "whois.registry.in",
-    "xn--y9a3aq": "whois.amnic.net",
-    "xn--yfro4i67o": "whois.zh.sgnic.sg",
-    "xn--ygbi2ammx": null,
+    "xn--y9a3aq": null,
+    "xn--yfro4i67o": null,
+    "xn--ygbi2ammx": "whois.pnina.ps",
     "xn--zckzah": null,
-    "xn--zfr164b": "whois.conac.cn",
+    "xn--zfr164b": "whois.nic.xn--zfr164b",
     "xperia": null,
     "xxx": "whois.nic.xxx",
     "xyz": "whois.nic.xyz",