diff --git a/resources/metadata.xml b/resources/metadata.xml
index aede2af..428b3a1 100644
--- a/resources/metadata.xml
+++ b/resources/metadata.xml
@@ -9789,20 +9789,19 @@
         <possibleLengths national="10"/>
         <exampleNumber>8002123456</exampleNumber>
         <nationalNumberPattern>
+          800(?:
+            14|
+            [2-9]\d
+          )\d{5}|
+          8[024]9[01]\d{6}|
           8(?:
-            00(?:
-              14|
-              [2-9]\d
-            )|
-            (?:
-              33|
-              44|
-              55|
-              66|
-              77|
-              88
-            )[2-9]\d
-          )\d{5}
+            33|
+            44|
+            55|
+            66|
+            77|
+            88
+          )[2-9]\d{6}
         </nationalNumberPattern>
       </tollFree>
       <premiumRate>
@@ -10310,7 +10309,7 @@
             7(?:
               [0167]\d|
               2[0-8]|
-              5[0-3]|
+              5[0-5]|
               8[0-7]
             )
           )\d{6}
@@ -10385,7 +10384,7 @@
     </territory>
 
     <!-- Spain (ES) -->
-    <!-- http://www.minetur.gob.es/telecomunicaciones/es-ES/Servicios/Numeracion/Documents/14-10_Descripcion_PNN.pdf -->
+    <!-- https://avance.digital.gob.es/en-us/Servicios/Numeracion/Paginas/Plan.aspx -->
     <territory id="ES" countryCode="34" internationalPrefix="00" mobileNumberPortableRegion="true">
       <availableFormats>
         <!-- 4-digit shortcodes which would otherwise be formatted as 'XXX X' -->
@@ -14452,7 +14451,7 @@
           55(?:
             4(?:
               [01]0|
-              5[0-2]
+              5[0-5]
             )|
             57[0-289]
           )\d{4}|
@@ -14521,7 +14520,7 @@
           7(?:
             38(?:
               [05]\d|
-              8[08]
+              8[018]
             )|
             8(?:
               33|
@@ -16988,7 +16987,7 @@
          nationalPrefixTransform rule can either be used to transform or to capture in fields like
          preferred_domestic_carrier_code; schema is designed this way. -->
     <territory id="JP" countryCode="81" internationalPrefix="010" nationalPrefix="0"
-               nationalPrefixForParsing="(000[259]\d{6})$|(?:(?:003768)0?)|0"
+               nationalPrefixForParsing="(000[2569]\d{4,6})$|(?:(?:003768)0?)|0"
                nationalPrefixTransformRule="$1" mobileNumberPortableRegion="true">
       <availableFormats>
         <!-- National-only toll-free numbers (0037, 0066, 0077 and 0088). -->
@@ -17139,14 +17138,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|
@@ -17156,7 +17156,8 @@
                 0[019]|
                 1
               )
-            )
+            )|
+            6[1-9]
           </leadingDigits>
           <format>$1-$2-$3</format>
         </numberFormat>
@@ -17542,7 +17543,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})">
@@ -17569,7 +17570,7 @@
       <generalDesc>
         <nationalNumberPattern>
           00[1-9]\d{6,14}|
-          [257-9]\d{9}|
+          [25-9]\d{9}|
           (?:
             00|
             [1-9]\d\d
@@ -17648,7 +17649,12 @@
       <mobile>
         <possibleLengths national="10"/>
         <exampleNumber>9012345678</exampleNumber>
-        <nationalNumberPattern>[7-9]0[1-9]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            601[0-4]0|
+            [7-9]0[1-9]\d\d
+          )\d{5}
+        </nationalNumberPattern>
       </mobile>
       <pager>
         <possibleLengths national="10"/>
@@ -20191,7 +20197,7 @@
             7(?:
               [0167]\d|
               2[0-8]|
-              5[0-3]|
+              5[0-5]|
               8[0-7]
             )
           )\d{6}
@@ -21392,15 +21398,12 @@
         <possibleLengths national="8"/>
         <exampleNumber>88123456</exampleNumber>
         <nationalNumberPattern>
-          (?:
-            83[01]|
-            92[0139]
-          )\d{5}|
+          92[0139]\d{5}|
           (?:
             5[05]|
             6[069]|
-            72|
-            8[015689]|
+            7[28]|
+            8[0135689]|
             9[013-9]
           )\d{6}
         </nationalNumberPattern>
@@ -21415,7 +21418,7 @@
           712[0-79]\d{4}|
           7(?:
             1[013-9]|
-            [5-9]\d
+            [5-79]\d
           )\d{5}
         </nationalNumberPattern>
       </voip>
@@ -23898,14 +23901,17 @@
         <possibleLengths national="8"/>
         <exampleNumber>92123456</exampleNumber>
         <nationalNumberPattern>
+          1505\d{4}|
           (?:
-            1505|
-            90[1-9]\d
-          )\d{4}|
-          (?:
-            7[126-9]|
-            9[1-9]
-          )\d{6}
+            7(?:
+              [126-9]\d|
+              41
+            )|
+            9(?:
+              0[1-9]|
+              [1-9]\d
+            )
+          )\d{5}
         </nationalNumberPattern>
       </mobile>
       <!-- Link to document about toll-free numbers on http://www.tra.gov.om, which suggests they
@@ -24325,7 +24331,7 @@
         <nationalNumberPattern>
           (?:
             7\d|
-            8[1-38]
+            8[1-48]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -26940,7 +26946,10 @@
         <possibleLengths national="8"/>
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
-          897[0-5]\d{4}|
+          89(?:
+            7[0-689]|
+            80
+          )\d{4}|
           (?:
             8(?:
               0[1-9]|
@@ -29868,9 +29877,11 @@
           (?:
             2742|
             305[3-9]|
-            472[247-9]|
-            505[2-57-9]|
-            983[2-47-9]
+            (?:
+              472|
+              983
+            )[2-47-9]|
+            505[2-57-9]
           )\d{6}|
           (?:
             2(?:
@@ -29978,9 +29989,11 @@
           (?:
             2742|
             305[3-9]|
-            472[247-9]|
-            505[2-57-9]|
-            983[2-47-9]
+            (?:
+              472|
+              983
+            )[2-47-9]|
+            505[2-57-9]
           )\d{6}|
           (?:
             2(?:
diff --git a/src/metadata/validations.json b/src/metadata/validations.json
index 828a909..c594ab4 100644
--- a/src/metadata/validations.json
+++ b/src/metadata/validations.json
@@ -409,7 +409,7 @@
   ],
   "jp": [
     "^\\d{8,17}$",
-    "^00[1-9]\\d{6,14}|[257-9]\\d{9}|(?:00|[1-9]\\d\\d)\\d{6}$"
+    "^00[1-9]\\d{6,14}|[25-9]\\d{9}|(?:00|[1-9]\\d\\d)\\d{6}$"
   ],
   "ke": [
     "^\\d{7,9}$",