diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index a40af516e..b91643bb8 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -5520,7 +5520,7 @@
       <!-- https://www.nationalnanpa.com/number_resource_info/5XX_codes.html -->
       <personalNumber>
         <possibleLengths national="10"/>
-        <exampleNumber>5002345678</exampleNumber>
+        <exampleNumber>5219023456</exampleNumber>
         <nationalNumberPattern>
           52(?:
             3(?:
@@ -5551,7 +5551,6 @@
           52[34][2-9]1[02-9]\d{4}|
           (?:
             5(?:
-              00|
               2[125-9]|
               33|
               44|
@@ -9258,15 +9257,17 @@
         <possibleLengths national="10,11"/>
         <exampleNumber>15123456789</exampleNumber>
         <nationalNumberPattern>
-          16[023]\d{7,8}|
-          1(?:
-            5310|
-            7[0-57-9]\d
-          )\d{6}|
           1(?:
-            5[0-25-9]|
-            76
-          )\d{8}
+            (?:
+              5(?:
+                [0-25-9]\d\d|
+                310
+              )|
+              76\d\d
+            )\d{6}|
+            6[023]\d{7,8}
+          )|
+          17\d{8}
         </nationalNumberPattern>
       </mobile>
       <pager>
@@ -9425,49 +9426,55 @@
         <exampleNumber>32123456</exampleNumber>
         <nationalNumberPattern>
           (?:
-            (?:
-              2\d|
-              9[1-46-9]
-            )\d|
+            2(?:
+              [0-59][1-9]|
+              [6-8]\d
+            )|
             3(?:
-              [0-37]\d|
-              4[013]|
-              5[0-58]|
-              6[01347-9]|
-              8[0-8]|
-              9[0-79]
+              [0-3][1-9]|
+              4[13]|
+              5[1-58]|
+              6[1347-9]|
+              7\d|
+              8[1-8]|
+              9[1-79]
             )|
             4(?:
-              [0-25]\d|
-              [34][02-9]|
-              6[013-579]|
-              7[013579]|
-              8[0-47]|
-              9[0-27]
+              [0-25][1-9]|
+              [34][2-9]|
+              6[13-579]|
+              7[13579]|
+              8[1-47]|
+              9[127]
             )|
             5(?:
-              [0-36]\d|
-              4[0146-9]|
-              5[03-57-9]|
-              7[0568]|
-              8[0-358]|
-              9[0-69]
+              [0-36][1-9]|
+              4[146-9]|
+              5[3-57-9]|
+              7[568]|
+              8[1-358]|
+              9[1-69]
             )|
             6(?:
-              [013578]\d|
-              2[0-68]|
-              4[02-8]|
-              6[01689]|
-              9[015689]
+              [0135][1-9]|
+              2[1-68]|
+              4[2-8]|
+              6[1689]|
+              [78]\d|
+              9[15689]
             )|
             7(?:
-              [0-69]\d|
-              7[03-9]|
-              8[0147]
+              [0-69][1-9]|
+              7[3-9]|
+              8[147]
             )|
             8(?:
-              [16-9]\d|
-              2[0-58]
+              [16-9][1-9]|
+              2[1-58]
+            )|
+            9(?:
+              [1-47-9][1-9]|
+              6\d
             )
           )\d{5}
         </nationalNumberPattern>
@@ -9477,10 +9484,19 @@
         <exampleNumber>34412345</exampleNumber>
         <nationalNumberPattern>
           (?:
-            [2-7]\d|
+            2[6-8]|
+            37|
+            6[78]|
+            96
+          )\d{6}|
+          (?:
+            2[0-59]|
+            3[0-689]|
+            [457]\d|
+            6[0-69]|
             8[126-9]|
-            9[1-46-9]
-          )\d{6}
+            9[1-47-9]
+          )[1-9]\d{5}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
@@ -14348,7 +14364,10 @@
         <exampleNumber>502345678</exampleNumber>
         <nationalNumberPattern>
           55(?:
-            410|
+            4(?:
+              [01]0|
+              5[0-2]
+            )|
             57[0-289]
           )\d{4}|
           5(?:
@@ -17032,14 +17051,15 @@
         </numberFormat>
         <numberFormat pattern="(\d)(\d{4})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            [36]|
+            3|
             4(?:
               2[09]|
               7[01]
-            )
+            )|
+            6[1-9]
           </leadingDigits>
           <leadingDigits>
-            [36]|
+            3|
             4(?:
               2(?:
                 0|
@@ -17049,7 +17069,8 @@
                 0[019]|
                 1
               )
-            )
+            )|
+            6[1-9]
           </leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
@@ -17435,7 +17456,7 @@
           <format>$1-$2-$3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{4})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[257-9]</leadingDigits>
+          <leadingDigits>[25-9]</leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
         <numberFormat pattern="(\d{4})(\d{3})(\d{3,4})">
@@ -17462,7 +17483,7 @@
       <generalDesc>
         <nationalNumberPattern>
           00[1-9]\d{6,14}|
-          [257-9]\d{9}|
+          [25-9]\d{9}|
           (?:
             00|
             [1-9]\d\d
@@ -17541,7 +17562,12 @@
       <mobile>
         <possibleLengths national="10"/>
         <exampleNumber>9012345678</exampleNumber>
-        <nationalNumberPattern>[7-9]0[1-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            60\d|
+            [7-9]0[1-9]
+          )\d{7}
+        </nationalNumberPattern>
       </mobile>
       <pager>
         <possibleLengths national="10"/>
@@ -18697,7 +18723,8 @@
             8(?:
               00|
               1[45]|
-              [48]8
+              4[89]|
+              88
             )|
             9(?:
               14|
@@ -18734,11 +18761,6 @@
           )\d{4}
         </nationalNumberPattern>
       </mobile>
-      <pager>
-        <possibleLengths national="10"/>
-        <exampleNumber>3458491234</exampleNumber>
-        <nationalNumberPattern>345849\d{4}</nationalNumberPattern>
-      </pager>
       <tollFree>
         <possibleLengths national="10"/>
         <exampleNumber>8002345678</exampleNumber>
@@ -21213,7 +21235,7 @@
 
     <!-- Mongolia (MN) -->
     <!-- http://www.itu.int/oth/T020200008E/en -->
-    <!-- http://www.crc.gov.mn/k/4L/36 -->
+    <!-- https://crc.gov.mn/articles/slug11334/en -->
     <territory id="MN" countryCode="976" internationalPrefix="001" nationalPrefix="0">
       <availableFormats>
         <!-- For fixed-line single digit area code numbers. We have only "1" as single digit
@@ -21312,6 +21334,7 @@
           (?:
             5[05]|
             6[069]|
+            72|
             8[015689]|
             9[013-9]
           )\d{6}
@@ -21327,7 +21350,7 @@
           712[0-79]\d{4}|
           7(?:
             1[013-9]|
-            [25-9]\d
+            [5-9]\d
           )\d{5}
         </nationalNumberPattern>
       </voip>
@@ -29692,7 +29715,7 @@
             [015-8]\d|
             2[067]|
             36|
-            4[0-6]|
+            4[0-7]|
             9[89]
           )\d{6}
         </nationalNumberPattern>
@@ -29765,14 +29788,12 @@
             5056(?:
               [0-35-9]\d|
               4[468]
-            )|
-            7302[0-4]\d
+            )
           )\d{4}|
           (?:
             305[3-9]|
             472[24]|
             505[2-57-9]|
-            7306|
             983[2-47-9]
           )\d{6}|
           (?:
@@ -29834,7 +29855,7 @@
               0[1-46-8]|
               1[2-9]|
               2[04-8]|
-              3[1247]|
+              3[0-247]|
               4[037]|
               5[47]|
               6[02359]|
@@ -29876,14 +29897,12 @@
             5056(?:
               [0-35-9]\d|
               4[468]
-            )|
-            7302[0-4]\d
+            )
           )\d{4}|
           (?:
             305[3-9]|
             472[24]|
             505[2-57-9]|
-            7306|
             983[2-47-9]
           )\d{6}|
           (?:
@@ -29945,7 +29964,7 @@
               0[1-46-8]|
               1[2-9]|
               2[04-8]|
-              3[1247]|
+              3[0-247]|
               4[037]|
               5[47]|
               6[02359]|
@@ -30158,8 +30177,7 @@
           (?:
             20|
             33|
-            [5-79]\d|
-            88
+            [5-9]\d
           )\d{7}
         </nationalNumberPattern>
       </generalDesc>
@@ -30248,7 +30266,7 @@
             (?:
               [25]0|
               33|
-              88|
+              8[78]|
               9[0-57-9]
             )\d{3}|
             6(?:
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
index 85eba5c84..eb3fbaf9d 100644
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@@ -3689,7 +3689,7 @@
         <nationalNumberPattern>
           1(?:
             1(?:
-              [2-48]|
+              [248]|
               6(?:
                 00[06]|
                 111
diff --git a/resources/carrier/en/229.txt b/resources/carrier/en/229.txt
index d949d178f..108aba6ec 100644
--- a/resources/carrier/en/229.txt
+++ b/resources/carrier/en/229.txt
@@ -23,6 +23,7 @@
 2290145|Moov
 2290146|MTN
 2290147|SBIN
+2290148|SBIN
 229015|MTN
 2290155|Moov
 2290158|Moov
diff --git a/resources/carrier/en/45.txt b/resources/carrier/en/45.txt
index fe9824284..ce104640d 100644
--- a/resources/carrier/en/45.txt
+++ b/resources/carrier/en/45.txt
@@ -21,53 +21,15 @@
 45207|telenor
 45208|telenor
 45209|telenor
-45211|tdc
-45212|tdc
-45213|tdc
-45214|tdc
-45215|tdc
-45216|tdc
-45217|tdc
-45218|tdc
-45219|tdc
-45221|telenor
-45222|telenor
-45223|telenor
-45224|telenor
-45225|telenor
-45226|telenor
-45227|telenor
-45228|telenor
-45229|telenor
-45231|Nuuday
-45232|Nuuday
-45233|Nuuday
-45234|Nuuday
-45235|Nuuday
+4521|tdc
+4522|telenor
+4523|Nuuday
 4523541|telenor
 4523561|telenor
-45236|Nuuday
 45237|tdc
-45238|Nuuday
-45239|Nuuday
 452395|telia
-45241|tdc
-45242|tdc
-45243|tdc
-45244|tdc
-45245|tdc
-45246|tdc
-45247|tdc
-45248|tdc
-45249|tdc
-45251|telenor
-45252|telenor
-45253|telenor
-45254|telenor
-45255|telenor
-45256|telenor
-45257|telenor
-45258|telenor
+4524|tdc
+4525|telenor
 452590|mi carrier services
 452591|link mobile
 452592|link mobile
@@ -86,56 +48,17 @@
 4525987|netfors unified messaging
 4525988|link mobile
 4525989|ipnordic
-452599|telenor
 4526|telia
 4527|telia
 4528|telia
-45291|tdc
-45292|tdc
-45293|tdc
-45294|tdc
-45295|tdc
-45296|tdc
-45297|tdc
-45298|tdc
-45299|tdc
-45301|tdc
-45302|tdc
-45303|tdc
-45304|tdc
-45305|tdc
-45306|tdc
-45307|tdc
-45308|tdc
-45309|tdc
-45311|3
-45312|3
-45313|3
+4529|tdc
+4530|tdc
+4531|3
 4531312|mi carrier services
-45314|3
-45315|3
-45316|3
-45317|3
 45318|lycamobile denmark ltd
 45319|telenor
-45321|telenor
-45322|telenor
-45323|telenor
-45324|telenor
-45325|telenor
-45326|telenor
-45327|telenor
-45328|telenor
-45329|telenor
-45331|telenor
-45332|telenor
-45333|telenor
-45334|telenor
-45335|telenor
-45336|telenor
-45337|telenor
-45338|telenor
-45339|telenor
+4532|telenor
+4533|telenor
 45341|telenor
 45342|telenor
 453434|telenor
@@ -145,42 +68,10 @@
 45347|telenor
 45348|telenor
 45349|telenor
-45351|telenor
-45352|telenor
-45353|telenor
-45354|telenor
-45355|telenor
-45356|telenor
-45357|telenor
-45358|telenor
-45359|telenor
-45361|telenor
-45362|telenor
-45363|telenor
-45364|telenor
-45365|telenor
-45366|telenor
-45367|telenor
-45368|telenor
-45369|telenor
-45381|telenor
-45382|telenor
-45383|telenor
-45384|telenor
-45385|telenor
-45386|telenor
-45387|telenor
-45388|telenor
-45389|telenor
-45391|telenor
-45392|telenor
-45393|telenor
-45394|telenor
-45395|telenor
-45396|telenor
-45397|telenor
-45398|telenor
-45399|telenor
+4535|telenor
+4536|telenor
+4538|telenor
+4539|telenor
 45401|tdc
 45402|tdc
 45403|tdc
@@ -190,15 +81,7 @@
 45407|telenor
 45408|telenor
 45409|telenor
-45411|telenor
-45412|telenor
-45413|telenor
-45414|telenor
-45415|telenor
-45416|telenor
-45417|telenor
-45418|telenor
-45419|telenor
+4541|telenor
 45421|telia
 45422|telia
 45423|telia
@@ -232,33 +115,9 @@
 454297|telia
 454298|telia
 454299|telia
-45431|telenor
-45432|telenor
-45433|telenor
-45434|telenor
-45435|telenor
-45436|telenor
-45437|telenor
-45438|telenor
-45439|telenor
-45441|telenor
-45442|telenor
-45443|telenor
-45444|telenor
-45445|telenor
-45446|telenor
-45447|telenor
-45448|telenor
-45449|telenor
-45451|telenor
-45452|telenor
-45453|telenor
-45454|telenor
-45455|telenor
-45456|telenor
-45457|telenor
-45458|telenor
-45459|telenor
+4543|telenor
+4544|telenor
+4545|telenor
 45461|telenor
 454626|Lancelot Telecom
 45463|telenor
@@ -268,24 +127,8 @@
 45467|telenor
 45468|telenor
 45469|telenor
-45471|telenor
-45472|telenor
-45473|telenor
-45474|telenor
-45475|telenor
-45476|telenor
-45477|telenor
-45478|telenor
-45479|telenor
-45481|telenor
-45482|telenor
-45483|telenor
-45484|telenor
-45485|telenor
-45486|telenor
-45487|telenor
-45488|telenor
-45489|telenor
+4547|telenor
+4548|telenor
 4549109|tdc
 454911|tdc
 454912|tdc
@@ -384,11 +227,7 @@
 4549789|tdc
 45498|telenor
 45499|telenor
-45501|telenor
-45502|telenor
-45503|telenor
-45504|telenor
-45505|telenor
+455|telenor
 455060|ipvision
 455061|svr technologies (mach connectivity)
 455062|cbb mobil
@@ -399,11 +238,7 @@
 455067|cbb mobil
 455068|cbb mobil
 455069|3
-45507|telenor
-45508|telenor
-45509|telenor
 4551|tdc
-45510|orange
 455188|telia
 455189|telia
 45521|telia
@@ -431,10 +266,6 @@
 455257|simservice
 455258|tdc
 455259|42 telecom ab
-45526|telenor
-45527|telenor
-45528|telenor
-45529|telenor
 45531|cbb mobil
 455319|telia
 45532|telia
@@ -447,60 +278,6 @@
 45538|3
 45539|cbb mobil
 455398|nextgen mobile ldt t/a cardboardfish
-45541|telenor
-45542|telenor
-45543|telenor
-45544|telenor
-45545|telenor
-45546|telenor
-45547|telenor
-45548|telenor
-45549|telenor
-45551|telenor
-45552|telenor
-45553|telenor
-45554|telenor
-45555|telenor
-45556|telenor
-45557|telenor
-45558|telenor
-45559|telenor
-45561|telenor
-45562|telenor
-45563|telenor
-45564|telenor
-45565|telenor
-45566|telenor
-45567|telenor
-45568|telenor
-45569|telenor
-45571|telenor
-45572|telenor
-45573|telenor
-45574|telenor
-45575|telenor
-45576|telenor
-45577|telenor
-45578|telenor
-45579|telenor
-45581|telenor
-45582|telenor
-45583|telenor
-45584|telenor
-45585|telenor
-45586|telenor
-45587|telenor
-45588|telenor
-45589|telenor
-45591|telenor
-45592|telenor
-45593|telenor
-45594|telenor
-45595|telenor
-45596|telenor
-45597|telenor
-45598|telenor
-45599|telenor
 45601|telia
 45602|telia
 45603|telia
@@ -521,28 +298,11 @@
 456098|telavox
 456099|svr technologies (mach connectivity)
 4561|tdc
-45610|orange
 456146|telia
 45618|telenor
 45619|telenor
-45621|telenor
-45622|telenor
-45623|telenor
-45624|telenor
-45625|telenor
-45626|telenor
-45627|telenor
-45628|telenor
-45629|telenor
-45631|telenor
-45632|telenor
-45633|telenor
-45634|telenor
-45635|telenor
-45636|telenor
-45637|telenor
-45638|telenor
-45639|telenor
+4562|telenor
+4563|telenor
 4564212|tdc
 4564215|tdc
 4564222|tdc
@@ -643,24 +403,8 @@
 4564897|tdc
 4564898|tdc
 4564899|tdc
-45651|telenor
-45652|telenor
-45653|telenor
-45654|telenor
-45655|telenor
-45656|telenor
-45657|telenor
-45658|telenor
-45659|telenor
-45661|telenor
-45662|telenor
-45663|telenor
-45664|telenor
-45665|telenor
-45666|telenor
-45667|telenor
-45668|telenor
-45669|telenor
+4565|telenor
+4566|telenor
 45691|telenor
 45692|telenor
 45693|telenor
@@ -756,79 +500,15 @@
 457197|mundio mobile
 457198|mundio mobile
 457199|firmafon
-45721|telenor
-45722|telenor
-45723|telenor
-45724|telenor
-45725|telenor
-45726|telenor
-45727|telenor
-45728|telenor
-45729|telenor
-45731|telenor
-45732|telenor
-45733|telenor
-45734|telenor
-45735|telenor
-45736|telenor
-45737|telenor
-45738|telenor
-45739|telenor
-45741|telenor
-45742|telenor
-45743|telenor
-45744|telenor
-45745|telenor
-45746|telenor
-45747|telenor
-45748|telenor
-45749|telenor
-45751|telenor
-45752|telenor
-45753|telenor
-45754|telenor
-45755|telenor
-45756|telenor
-45757|telenor
-45758|telenor
-45759|telenor
-45761|telenor
-45762|telenor
-45763|telenor
-45764|telenor
-45765|telenor
-45766|telenor
-45767|telenor
-45768|telenor
-45769|telenor
-45771|telenor
-45772|telenor
-45773|telenor
-45774|telenor
-45775|telenor
-45776|telenor
-45777|telenor
-45778|telenor
-45779|telenor
-45781|telenor
-45782|telenor
-45783|telenor
-45784|telenor
-45785|telenor
-45786|telenor
-45787|telenor
+4572|telenor
+4573|telenor
+4574|telenor
+4575|telenor
+4576|telenor
+4577|telenor
+4578|telenor
 457879|supertel danmark
-45788|telenor
-45789|telenor
-45791|telenor
-45792|telenor
-45793|telenor
-45794|telenor
-45795|telenor
-45796|telenor
-45797|telenor
-45798|telenor
-45799|telenor
+4579|telenor
 45811|telenor
 45812|telenor
 458130|cbb mobil
@@ -885,51 +565,11 @@
 458197|cbb mobil
 458198|cbb mobil
 458199|telenor
-45821|telenor
-45822|telenor
-45823|telenor
-45824|telenor
-45825|telenor
-45826|telenor
-45827|telenor
-45828|telenor
-45829|telenor
-45861|telenor
-45862|telenor
-45863|telenor
-45864|telenor
-45865|telenor
-45866|telenor
-45867|telenor
-45868|telenor
-45869|telenor
-45871|telenor
-45872|telenor
-45873|telenor
-45874|telenor
-45875|telenor
-45876|telenor
-45877|telenor
-45878|telenor
-45879|telenor
-45881|telenor
-45882|telenor
-45883|telenor
-45884|telenor
-45885|telenor
-45886|telenor
-45887|telenor
-45888|telenor
-45889|telenor
-45891|telenor
-45892|telenor
-45893|telenor
-45894|telenor
-45895|telenor
-45896|telenor
-45897|telenor
-45898|telenor
-45899|telenor
+4582|telenor
+4586|telenor
+4587|telenor
+4588|telenor
+4589|telenor
 459110|lebara limited
 459111|lebara limited
 459112|simservice
@@ -979,11 +619,9 @@
 45919|lebara limited
 459190|intelecom
 459191|maxtel.dk
+4592|telenor
 45921|tdc
 459217|interactive digital media gmbh
-459218|telenor
-459219|telenor
-459220|telenor
 459221|tdc
 459222|tdc
 459223|42 telecom ab
@@ -993,28 +631,18 @@
 459227|mundio mobile
 459228|mundio mobile
 459229|beepsend ab
-45923|telenor
 459240|gigsky aps
 459241|gigsky aps
 459242|gigsky aps
 459243|tdc
 459244|ipnordic
 459245|compatel limited
-459246|telenor
-459247|telenor
-459248|telenor
-459249|telenor
-45925|telenor
-45926|telenor
-45927|telenor
 459270|ice danmark
 459272|thyfon
-45928|telenor
 459280|voxbone
 459281|gigsky aps
 459282|flexfone
 459283|tdc
-45929|telenor
 459290|fullrate
 459299|ipvision
 459310|fullrate
@@ -1089,21 +717,5 @@
 45976|telenor
 45978|telenor
 45979|telenor
-45981|telenor
-45982|telenor
-45983|telenor
-45984|telenor
-45985|telenor
-45986|telenor
-45987|telenor
-45988|telenor
-45989|telenor
-45991|telenor
-45992|telenor
-45993|telenor
-45994|telenor
-45995|telenor
-45996|telenor
-45997|telenor
-45998|telenor
-45999|telenor
+4598|telenor
+4599|telenor
diff --git a/resources/carrier/en/972.txt b/resources/carrier/en/972.txt
index b4359f369..c7bfdf2f7 100644
--- a/resources/carrier/en/972.txt
+++ b/resources/carrier/en/972.txt
@@ -14,12 +14,14 @@
 9725531|019mobile
 9725532|Free Telecom
 9725533|Free Telecom
+9725540|Rami Levy
 9725541|Merkaziya
 9725543|Maskyoo
 9725544|Cellran Cellular Communications
 97255440|Merkaziya
 97255442|Xphone
 97255443|Yossi
+9725545|Maskyoo
 9725550|Annatel
 9725551|Annatel
 9725552|Annatel
diff --git a/resources/carrier/en/976.txt b/resources/carrier/en/976.txt
index 113cdf5b7..82ccfc79d 100644
--- a/resources/carrier/en/976.txt
+++ b/resources/carrier/en/976.txt
@@ -17,6 +17,7 @@
 97660|ONDO
 97666|ONDO
 97669|Skytel
+97672|Lime
 97680|Unitel
 97681|ONDO
 97683|G-Mobile
diff --git a/resources/geocoding/en/1.txt b/resources/geocoding/en/1.txt
index d33a83d1c..4c2ab76fa 100644
--- a/resources/geocoding/en/1.txt
+++ b/resources/geocoding/en/1.txt
@@ -7630,7 +7630,7 @@
 13457|Cayman Islands
 134580|Cayman Islands
 134581|Cayman Islands
-1345848|Cayman Islands
+134584|Cayman Islands
 134588|Cayman Islands
 1345914|Cayman Islands
 134594|Cayman Islands
diff --git a/resources/geocoding/en/86.txt b/resources/geocoding/en/86.txt
index 0640b5f45..6cfdb4caa 100644
--- a/resources/geocoding/en/86.txt
+++ b/resources/geocoding/en/86.txt
@@ -87615,7 +87615,6 @@
 861709997|Zhongshan, Guangdong
 861709998|Shenzhen, Guangdong
 861709999|Guangzhou, Guangdong
-86173|Beijing
 8617600|Beijing
 8617601|Beijing
 86176012|Shanghai
diff --git a/resources/geocoding/zh/86.txt b/resources/geocoding/zh/86.txt
index 0a7562aeb..b9aba33e6 100644
--- a/resources/geocoding/zh/86.txt
+++ b/resources/geocoding/zh/86.txt
@@ -87615,7 +87615,6 @@
 861709997|广东省中山市
 861709998|广东省深圳市
 861709999|广东省广州市
-86173|北京市
 8617600|北京市
 8617601|北京市
 86176012|上海市
diff --git a/resources/timezones/map_data.txt b/resources/timezones/map_data.txt
index f3ffe1bb1..737ba0d80 100644
--- a/resources/timezones/map_data.txt
+++ b/resources/timezones/map_data.txt
@@ -3203,8 +3203,7 @@
 786|Europe/Moscow
 787|Europe/Moscow
 79|Europe/Moscow
-81|Asia/Shanghai
-8170859|Asia/Shanghai
+81|Asia/Tokyo
 82|Asia/Seoul
 84|Asia/Ho_Chi_Minh
 850|Asia/Seoul