diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index 616f9e16c..db3b00ede 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -1556,7 +1556,7 @@
3(?:
364|
4(?:
- 1[2-7]|
+ 1[2-8]|
[235][4-6]|
84
)|
@@ -1829,7 +1829,7 @@
3(?:
364|
4(?:
- 1[2-7]|
+ 1[2-8]|
[235][4-6]|
84
)|
@@ -3567,6 +3567,7 @@
8001234567
80[03]\d{7}
+
9604123456
@@ -3575,6 +3576,7 @@
0[469]|
1[0-47]|
3[389]|
+ 43|
6[69]|
7[78]
)\d{6}
@@ -12206,7 +12208,7 @@
- [2-46-9]
+ [2-9]
$1 $2
@@ -12215,6 +12217,7 @@
9008\d{3}|
(?:
[2-467]\d\d|
+ 510|
862
)\d{4}
@@ -12252,8 +12255,14 @@
6091234
(?:
+ 510|
6\d\d|
- 70[0-35-7]
+ 7(?:
+ 0\d|
+ 1[0-8]|
+ 25|
+ 49
+ )
)\d{4}
@@ -13384,7 +13393,8 @@
55410\d{4}|
5(?:
(?:
- [0-249][2-9]|
+ [02][02-9]|
+ [149][2-9]|
[36]\d|
8[3-7]
)\d|
@@ -22722,21 +22732,23 @@
- 8[1-579]
+ 8[1-79]
$1 $2
50[036-8]|
- [89]0
+ 8|
+ 90
50(?:
[0367]|
88
)|
- [89]0
+ 8|
+ 90
$1 $2 $3
@@ -22757,8 +22769,7 @@
10|
74
)|
- [59]|
- 80
+ [589]
$1 $2 $3
@@ -22782,25 +22793,23 @@
[169]|
7[0-35-9]
)|
- 7|
- 86
+ 7
$1 $2 $3
- [29]\d{7,9}|
+ [1289]\d{9}|
50\d{5}(?:
\d{2,3}
)?|
- 6[0-35-9]\d{6}|
- 7\d{7,8}|
- 8\d{4,9}|
+ [27-9]\d{7,8}|
(?:
- 11\d|
- [34]
- )\d{7}
+ [34]\d|
+ 6[0-35-9]
+ )\d{6}|
+ 8\d{4,6}
@@ -22831,11 +22840,6 @@
)\d{5}
-
-
- 86123456
- 86\d{6,7}
-
@@ -22855,7 +22859,7 @@
900123456
(?:
- 11\d{5}|
+ 1[13-57-9]\d{5}|
50(?:
0[08]|
30|
@@ -22877,11 +22881,12 @@
83012378
8(?:
- 1[6-9]|
+ 1[16-9]|
22|
3\d|
4[045]|
5[459]|
+ 6[235-9]|
7[0-3579]|
90
)\d{2,7}
@@ -22929,7 +22934,7 @@
(?:
7(?:
[1289]\d|
- 69|
+ 6[89]|
7[0-5]
)|
9(?:
@@ -25250,14 +25255,14 @@
0
$1 $2 $3 $4
-
- [7-9]
- $1 $2 $3
-
2
$1 $2 $3
+
+ [7-9]
+ $1 $2 $3
+
@@ -25285,7 +25290,7 @@
720123456
- 7[2389]\d{7}
+ 7[237-9]\d{7}
@@ -27697,7 +27702,7 @@
(?:
(?:
[259]\d|
- 4[0-7]
+ 4[0-8]
)\d|
3(?:
1[1-35]|
diff --git a/resources/carrier/en/216.txt b/resources/carrier/en/216.txt
index 509e9a70b..2bae77d36 100644
--- a/resources/carrier/en/216.txt
+++ b/resources/carrier/en/216.txt
@@ -20,5 +20,6 @@
2164|Tunisie Telecom
21645|Watany Ettisalat
21646|Ooredoo
+21648|Ooredoo
2165|Orange
2169|Tunisie Telecom
diff --git a/resources/carrier/en/250.txt b/resources/carrier/en/250.txt
index be840e522..da94589fe 100644
--- a/resources/carrier/en/250.txt
+++ b/resources/carrier/en/250.txt
@@ -16,5 +16,6 @@
25072|TIGO
25073|Airtel
+25077|KtRN
25078|MTN
25079|MTN
diff --git a/resources/carrier/en/46.txt b/resources/carrier/en/46.txt
index 605dc8834..314f8d822 100644
--- a/resources/carrier/en/46.txt
+++ b/resources/carrier/en/46.txt
@@ -14,6 +14,7 @@
46701347|EU Tel AB
46701348|EU Tel AB
46701349|EU Tel AB
+46701350|42 Telecom AB
46701353|EU Tel AB
46701356|EU Tel AB
46701358|EU Tel AB
diff --git a/resources/carrier/en/56.txt b/resources/carrier/en/56.txt
index 77908cd57..7a10e102c 100644
--- a/resources/carrier/en/56.txt
+++ b/resources/carrier/en/56.txt
@@ -2721,6 +2721,7 @@
569379|Ops Ingenieria Ltda.
569380|Ops Ingenieria Ltda.
569381|Ops Ingenieria Ltda.
+569388|Entel
56940|Entel
56941|Movistar
56942|Entel
diff --git a/resources/carrier/en/592.txt b/resources/carrier/en/592.txt
index 1969c0b11..2d948f1de 100644
--- a/resources/carrier/en/592.txt
+++ b/resources/carrier/en/592.txt
@@ -12,29 +12,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+5925|GTT
592600|Digicel Guyana
592601|Digicel Guyana
592602|Digicel Guyana
592603|Digicel Guyana
592604|Digicel Guyana
592608|Digicel Guyana
-592609|Guyana Telephone and Telegraph Company
-59261|Guyana Telephone and Telegraph Company
-59262|Guyana Telephone and Telegraph Company
+592609|GTT
+59261|GTT
+59262|GTT
592630|Digicel Guyana
+592631|GTT
592632|Digicel Guyana
592636|Digicel Guyana
592637|Digicel Guyana
-592638|Guyana Telephone and Telegraph Company
-592639|Guyana Telephone and Telegraph Company
-59264|Guyana Telephone and Telegraph Company
-59265|Guyana Telephone and Telegraph Company
-592659|Digicel Guyana
+592638|GTT
+592639|GTT
+59264|GTT
+59265|GTT
59266|Digicel Guyana
59267|Digicel Guyana
59268|Digicel Guyana
59269|Digicel Guyana
-592700|Digicel Guyana
-592701|Digicel Guyana
-592702|Digicel Guyana
-592703|Digicel Guyana
+59270|GTT
+59271|GTT
+59272|GTT
+59274|GTT
diff --git a/resources/metadata/216/ranges.csv b/resources/metadata/216/ranges.csv
index 8a39789e1..436e3d26a 100644
--- a/resources/metadata/216/ranges.csv
+++ b/resources/metadata/216/ranges.csv
@@ -17,6 +17,7 @@ Prefix ; Length ; Type ; Tariff ; Operator
45 ; 8 ; MOBILE ; STANDARD_RATE ; "watany_ettisalat" ; "fmt1_2/3/3" ; "TN"
46 ; 8 ; MOBILE ; STANDARD_RATE ; "ooredoo" ; "fmt1_2/3/3" ; "TN" ; ; IR21 ; "IR21 dated 8/6/2018"
47 ; 8 ; MOBILE ; STANDARD_RATE ; "tunisie_telecom" ; "fmt1_2/3/3" ; "TN"
+48 ; 8 ; MOBILE ; STANDARD_RATE ; "ooredoo" ; "fmt1_2/3/3" ; "TN" ; ; IR21
5 ; 8 ; MOBILE ; STANDARD_RATE ; "orange" ; "fmt1_2/3/3" ; "TN"
70 ; 8 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_2/3/3" ; "TN" ; "Ben Arous"
71 ; 8 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_2/3/3" ; "TN" ; "Ariana/Ben Arous/Carthage/Tunis"
diff --git a/resources/metadata/250/operators.csv b/resources/metadata/250/operators.csv
index 730f875e8..8308bd83b 100644
--- a/resources/metadata/250/operators.csv
+++ b/resources/metadata/250/operators.csv
@@ -1,4 +1,5 @@
-Id ; Name:en
-airtel ; "Airtel"
-mtn ; "MTN"
-tigo ; "TIGO"
+Id ; Name:en
+airtel ; "Airtel"
+kt_rwanda ; "KtRN"
+mtn ; "MTN"
+tigo ; "TIGO"
diff --git a/resources/metadata/250/ranges.csv b/resources/metadata/250/ranges.csv
index a80476198..63b0bff45 100644
--- a/resources/metadata/250/ranges.csv
+++ b/resources/metadata/250/ranges.csv
@@ -1,9 +1,10 @@
-Prefix ; Length ; Type ; Tariff ; Operator ; Format ; Regions ; Provenance
-06 ; 8 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt3_2/2/2/2" ; "RW" ; ITU
-2[23568] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/3/3" ; "RW" ; GOVERNMENT
-72 ; 9 ; MOBILE ; STANDARD_RATE ; "tigo" ; "fmt2_3/3/3" ; "RW" ; IR21
-73 ; 9 ; MOBILE ; STANDARD_RATE ; "airtel" ; "fmt2_3/3/3" ; "RW" ; IR21
-78 ; 9 ; MOBILE ; STANDARD_RATE ; "mtn" ; "fmt2_3/3/3" ; "RW" ; GOVERNMENT
-79 ; 9 ; MOBILE ; STANDARD_RATE ; "mtn" ; "fmt2_3/3/3" ; "RW" ; IR21
-800 ; 9 ; FIXED_LINE ; TOLL_FREE ; ; "fmt2_3/3/3" ; "RW"
-900 ; 9 ; FIXED_LINE ; PREMIUM_RATE ; ; "fmt2_3/3/3" ; "RW"
+Prefix ; Length ; Type ; Tariff ; Operator ; Format ; Regions ; Provenance
+06 ; 8 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt3_2/2/2/2" ; "RW" ; ITU
+2[23568] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/3/3" ; "RW" ; GOVERNMENT
+72 ; 9 ; MOBILE ; STANDARD_RATE ; "tigo" ; "fmt2_3/3/3" ; "RW" ; IR21
+73 ; 9 ; MOBILE ; STANDARD_RATE ; "airtel" ; "fmt2_3/3/3" ; "RW" ; IR21
+77 ; 9 ; MOBILE ; STANDARD_RATE ; "kt_rwanda" ; "fmt2_3/3/3" ; "RW" ; GOVERNMENT
+78 ; 9 ; MOBILE ; STANDARD_RATE ; "mtn" ; "fmt2_3/3/3" ; "RW" ; GOVERNMENT
+79 ; 9 ; MOBILE ; STANDARD_RATE ; "mtn" ; "fmt2_3/3/3" ; "RW" ; IR21
+800 ; 9 ; FIXED_LINE ; TOLL_FREE ; ; "fmt2_3/3/3" ; "RW"
+900 ; 9 ; FIXED_LINE ; PREMIUM_RATE ; ; "fmt2_3/3/3" ; "RW"
diff --git a/resources/metadata/27/ranges.csv b/resources/metadata/27/ranges.csv
index e46ada161..d34764bea 100644
--- a/resources/metadata/27/ranges.csv
+++ b/resources/metadata/27/ranges.csv
@@ -7,20 +7,20 @@ Prefix ; Length ; Type ; Tariff ; Operator
1049[2-4] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Johannesburg" ; IR21 ; "IR21 dated 12/11/2018"
1049[568] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Johannesburg" ; GOVERNMENT
11 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Johannesburg"
-12[0-259] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; GOVERNMENT
-12[367] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; ; "Fillup To Support Master Range"
+12[0-3579] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; GOVERNMENT
124[0-578] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; ; "Fillup To Support Master Range"
1246 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; GOVERNMENT
1249[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; ; "Fillup To Support Master Range"
12492 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; IR21 ; "IR21 dated 12/11/2018"
+126 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane" ; ; "Fillup To Support Master Range"
128 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Brits/Tshwane"
130 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank"
-13[1-369] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; GOVERNMENT
+13[1-36-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; GOVERNMENT
134[0-8] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; ; "Fillup To Support Master Range"
1349[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; ; "Fillup To Support Master Range"
13492[0-25] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; IR21 ; "IR21 dated 12/11/2018"
13492[346-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; ; "Fillup To Support Master Range"
-13[578] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; ; "Fillup To Support Master Range"
+135 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Bronkhorstspruit/Eastern Gauteng/Middelburg/Nelspruit/Northern and Western Mpumalanga/Witbank" ; ; "Fillup To Support Master Range"
14[0-27] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Modimolle/Northern North West and Southwestern Limpopo/Rustenburg" ; GOVERNMENT
14[3568] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Modimolle/Northern North West and Southwestern Limpopo/Rustenburg" ; ; "Fillup To Support Master Range"
144[0-578] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Modimolle/Northern North West and Southwestern Limpopo/Rustenburg" ; ; "Fillup To Support Master Range"
@@ -38,14 +38,15 @@ Prefix ; Length ; Type ; Tariff ; Operator
154920 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Northern and Eastern Limpopo/Polokwane" ; IR21 ; "IR21 dated 12/11/2018"
15492[1-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and Eastern Limpopo/Polokwane" ; ; "Fillup To Support Master Range"
15495[01] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Northern and Eastern Limpopo/Polokwane" ; IR21 ; "IR21 dated 12/11/2018"
-15495[25-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and Eastern Limpopo/Polokwane" ; ; "Fillup To Support Master Range"
-15495[34] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and Eastern Limpopo/Polokwane" ; GOVERNMENT
+15495[2-4] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and Eastern Limpopo/Polokwane" ; GOVERNMENT
+15495[5-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and Eastern Limpopo/Polokwane" ; ; "Fillup To Support Master Range"
16[0-3] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; GOVERNMENT
164[0-578] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; ; "Fillup To Support Master Range"
1646 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; GOVERNMENT
1649[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; ; "Fillup To Support Master Range"
164920 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle"
-16492[1-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; ; "Fillup To Support Master Range"
+164921 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; GOVERNMENT
+16492[2-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; ; "Fillup To Support Master Range"
16[5-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Vaal Triangle" ; ; "Fillup To Support Master Range"
17[02] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Ermelo/Secunda/Southern Mpumalanga" ; GOVERNMENT
17[135-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Ermelo/Secunda/Southern Mpumalanga" ; ; "Fillup To Support Master Range"
@@ -96,8 +97,8 @@ Prefix ; Length ; Type ; Tariff ; Operator
28[689] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Caledon/Hermanus/Southern coast of Western Cape/Swellendam" ; ; "Fillup To Support Master Range"
31[03] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban"
31[12589] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban" ; GOVERNMENT
-314[02-8] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban" ; ; "Fillup To Support Master Range"
-3141 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban" ; GOVERNMENT
+314[01] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban" ; GOVERNMENT
+314[2-8] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban" ; ; "Fillup To Support Master Range"
3149[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban" ; ; "Fillup To Support Master Range"
31492 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Durban" ; IR21 ; "IR21 dated 12/11/2018"
31[67] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Durban" ; ; "Fillup To Support Master Range"
@@ -106,7 +107,8 @@ Prefix ; Length ; Type ; Tariff ; Operator
324[0-8] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam" ; ; "Fillup To Support Master Range"
3249[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam" ; ; "Fillup To Support Master Range"
324920 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam"
-32492[1-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam" ; ; "Fillup To Support Master Range"
+324921 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam" ; GOVERNMENT
+32492[2-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam" ; ; "Fillup To Support Master Range"
330 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "KwaZulu Natal Midlands/Pietermaritzburg"
33[1-37] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "KwaZulu Natal Midlands/Pietermaritzburg" ; GOVERNMENT
334[0-578] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "KwaZulu Natal Midlands/Pietermaritzburg" ; ; "Fillup To Support Master Range"
@@ -136,13 +138,13 @@ Prefix ; Length ; Type ; Tariff ; Operator
364920 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Drakensberg/Ladysmith"
36492[1-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Drakensberg/Ladysmith" ; ; "Fillup To Support Master Range"
36[6-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Drakensberg/Ladysmith" ; ; "Fillup To Support Master Range"
-39[05-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; ; "Fillup To Support Master Range"
-39[1-3] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; GOVERNMENT
+39[0-3] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; GOVERNMENT
394[0-578] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; ; "Fillup To Support Master Range"
3946 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; GOVERNMENT
3949[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; ; "Fillup To Support Master Range"
394920 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; IR21 ; "IR21 dated 12/11/2018"
39492[1-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; ; "Fillup To Support Master Range"
+39[5-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Eastern Pondoland/Port Shepstone/Southern coast of KwaZulu Natal" ; ; "Fillup To Support Master Range"
40[0-38] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Alice/Bhisho" ; GOVERNMENT
404[0-58] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Alice/Bhisho" ; ; "Fillup To Support Master Range"
404[67] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Alice/Bhisho" ; GOVERNMENT
@@ -151,8 +153,8 @@ Prefix ; Length ; Type ; Tariff ; Operator
40492[1-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Alice/Bhisho" ; ; "Fillup To Support Master Range"
40[5-79] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Alice/Bhisho" ; ; "Fillup To Support Master Range"
41[0-35] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; GOVERNMENT
-414[024-8] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; ; "Fillup To Support Master Range"
-414[13] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; GOVERNMENT
+414[013] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; GOVERNMENT
+414[24-8] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; ; "Fillup To Support Master Range"
4149[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; ; "Fillup To Support Master Range"
41492 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; IR21 ; "IR21 dated 12/11/2018"
41[6-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Port Elizabeth/Uitenhage" ; ; "Fillup To Support Master Range"
@@ -169,7 +171,8 @@ Prefix ; Length ; Type ; Tariff ; Operator
4346 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "East London" ; GOVERNMENT
4349[014-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "East London" ; ; "Fillup To Support Master Range"
43492[01] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "East London"
-43492[2-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "East London" ; ; "Fillup To Support Master Range"
+434922 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "East London" ; GOVERNMENT
+43492[3-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "East London" ; ; "Fillup To Support Master Range"
43493 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "East London" ; IR21
44[0-257] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; GOVERNMENT
44[3689] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; ; "Fillup To Support Master Range"
@@ -177,7 +180,8 @@ Prefix ; Length ; Type ; Tariff ; Operator
4446 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; GOVERNMENT
4449[013-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; ; "Fillup To Support Master Range"
44492[01] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom" ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; IR21 ; "IR21 dated 12/11/2018"
-44492[2-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; ; "Fillup To Support Master Range"
+444922 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; GOVERNMENT
+44492[3-9] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Garden Route/George/Knysna/Mossel Bay/Oudtshoorn/Plettenberg Bay" ; ; "Fillup To Support Master Range"
450 ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and eastern parts of Eastern Cape/Queenstown"
45[1-35] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and eastern parts of Eastern Cape/Queenstown" ; GOVERNMENT
454[0-578] ; 9 ; FIXED_LINE ; STANDARD_RATE ; ; "all_types_2/3/4" ; "ZA" ; "Northern and eastern parts of Eastern Cape/Queenstown" ; ; "Fillup To Support Master Range"
diff --git a/resources/metadata/46/ranges.csv b/resources/metadata/46/ranges.csv
index 13c755e60..6bf34b66a 100644
--- a/resources/metadata/46/ranges.csv
+++ b/resources/metadata/46/ranges.csv
@@ -458,7 +458,8 @@ Prefix ; Length ; Type ; Tariff ; Operator
70134[05] ; 9 ; MOBILE ; STANDARD_RATE ; ; "mobile_etc_2/3/2/2" ; "SE"
70134[126-9] ; 9 ; MOBILE ; STANDARD_RATE ; "eu_tel_ab" ; "mobile_etc_2/3/2/2" ; "SE" ; ; ; GOVERNMENT
70134[34] ; 9 ; MOBILE ; STANDARD_RATE ; ; "mobile_etc_2/3/2/2" ; "SE" ; ; ; GOVERNMENT
-70135[015] ; 9 ; MOBILE ; STANDARD_RATE ; ; "mobile_etc_2/3/2/2" ; "SE" ; ; ; GOVERNMENT
+701350 ; 9 ; MOBILE ; STANDARD_RATE ; "42_telecom_ab" ; "mobile_etc_2/3/2/2" ; "SE" ; ; ; GOVERNMENT
+70135[15] ; 9 ; MOBILE ; STANDARD_RATE ; ; "mobile_etc_2/3/2/2" ; "SE" ; ; ; GOVERNMENT
70135[247] ; 9 ; MOBILE ; STANDARD_RATE ; ; "mobile_etc_2/3/2/2" ; "SE"
70135[3689] ; 9 ; MOBILE ; STANDARD_RATE ; "eu_tel_ab" ; "mobile_etc_2/3/2/2" ; "SE" ; ; ; GOVERNMENT
70136[03] ; 9 ; MOBILE ; STANDARD_RATE ; ; "mobile_etc_2/3/2/2" ; "SE" ; ; ; GOVERNMENT
diff --git a/resources/metadata/54/ranges.csv b/resources/metadata/54/ranges.csv
index 8544c1ff2..ca892f722 100644
--- a/resources/metadata/54/ranges.csv
+++ b/resources/metadata/54/ranges.csv
@@ -1,6 +1,7 @@
Prefix ; Length ; Type ; Tariff ; Area Code Length ; National Only ; Format ; Regions ; Geocode:en ; Geocode:es ; Provenance ; Comment
-11[18] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 2 ; false ; "geo_2/4/4" ; "AR" ; "Buenos Aires" ; "Buenos Aires" ; ; "Added based on client T#04478056"
+111 ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 2 ; false ; "geo_2/4/4" ; "AR" ; "Buenos Aires" ; "Buenos Aires" ; ; "Added Based on client T#04478056"
11[2-7] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 2 ; false ; "geo_2/4/4" ; "AR" ; "Buenos Aires" ; "Buenos Aires"
+118 ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 2 ; false ; "geo_2/4/4" ; "AR" ; "Buenos Aires" ; "Buenos Aires" ; ; "Added based on client T#04478056"
2202[4-6] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 4 ; false ; "geo_4/2/4" ; "AR" ; "González Catán/Virrey del Pino, Buenos Aires" ; "González Catán/Virrey del Pino, Buenos Aires"
220[45] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3 ; false ; "geo_3/3/4" ; "AR" ; "Merlo, Buenos Aires" ; "Merlo, Buenos Aires"
221[2-6] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3 ; false ; "geo_3/3/4" ; "AR" ; "La Plata, Buenos Aires" ; "La Plata, Buenos Aires"
@@ -169,6 +170,7 @@ Prefix ; Length ; Type ; Tariff ; Area Code Lengt
3408[4-6] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 4 ; false ; "geo_4/2/4" ; "AR" ; "San Cristóbal, Santa Fe" ; "San Cristóbal, Santa Fe"
3409[4-6] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 4 ; false ; "geo_4/2/4" ; "AR" ; "Moisés Ville, Santa Fe" ; "Moisés Ville, Santa Fe"
341[2-7] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3 ; false ; "geo_3/3/4" ; "AR" ; "Rosario, Santa Fe" ; "Rosario, Santa Fe"
+3418 ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3 ; false ; "geo_3/3/4" ; "AR" ; "Rosario, Santa Fe" ; "Rosario, Santa Fe" ; GOVERNMENT
342[4-6] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3 ; false ; "geo_3/3/4" ; "AR" ; "Santa Fe, Santa Fe" ; "Santa Fe, Santa Fe"
3434 ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3 ; false ; "geo_3/3/4" ; "AR" ; "Paraná, Entre Ríos" ; "Paraná, Entre Ríos"
3435[0-37-9] ; 10 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3 ; false ; "geo_3/3/4" ; "AR" ; "Nogoyá, Entre Ríos" ; "Nogoyá, Entre Ríos"
diff --git a/resources/metadata/56/ranges.csv b/resources/metadata/56/ranges.csv
index 44115ee02..887218e16 100644
--- a/resources/metadata/56/ranges.csv
+++ b/resources/metadata/56/ranges.csv
@@ -1451,7 +1451,8 @@ Prefix ; Length ; Type ; Tariff ; National Only
937[0-8] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; "wom" ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; GOVERNMENT
9379 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; "ops_ingenieria" ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; GOVERNMENT
938[01] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; "ops_ingenieria" ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; GOVERNMENT
-938[2-9] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; ; "FILLUP TO SUPPORT MASTER RANGE"
+938[2-79] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; ; "FILLUP TO SUPPORT MASTER RANGE"
+9388 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; "entel" ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; IR21
939 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; ; "FILLUP TO SUPPORT MASTER RANGE"
94[024] ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; "entel" ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; IR21
941 ; 9 ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; false ; "movistar" ; "mobile_1/4/4" ; "America/Santiago" ; "CL" ; ; ; IR21
diff --git a/resources/metadata/592/operators.csv b/resources/metadata/592/operators.csv
index db681361a..b1a16e730 100644
--- a/resources/metadata/592/operators.csv
+++ b/resources/metadata/592/operators.csv
@@ -1,3 +1,3 @@
Id ; Name:en
digicel_guyana ; "Digicel Guyana"
-gt&t ; "Guyana Telephone and Telegraph Company"
+gtt ; "GTT"
diff --git a/resources/metadata/592/ranges.csv b/resources/metadata/592/ranges.csv
index e34a2257d..bbf3f2850 100644
--- a/resources/metadata/592/ranges.csv
+++ b/resources/metadata/592/ranges.csv
@@ -59,20 +59,21 @@ Prefix ; Length ; Type ; Tariff ; Operator ; Format ;
444 ; 7 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; "Linden/Canvas City/Wisroc" ; ITU
455 ; 7 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; "Bartica" ; ITU
456 ; 7 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; "Mahdia" ; ITU
+510 ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
60[0-48] ; 7 ; MOBILE ; STANDARD_RATE ; "digicel_guyana" ; "fmt1_3/4" ; "GY" ; ; IR21
60[5-7] ; 7 ; MOBILE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; ; ; "FILLUP THE MASTER RANGE"
-609 ; 7 ; MOBILE ; STANDARD_RATE ; "gt&t" ; "fmt1_3/4" ; "GY" ; ; IR21
-6[124] ; 7 ; MOBILE ; STANDARD_RATE ; "gt&t" ; "fmt1_3/4" ; "GY" ; ; IR21
+609 ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
+6[1245] ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
630 ; 7 ; MOBILE ; STANDARD_RATE ; "digicel_guyana" ; "fmt1_3/4" ; "GY" ; ; IR21
-63[135] ; 7 ; MOBILE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; ; ; "FILLUP THE MASTER RANGE"
+63[189] ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
63[267] ; 7 ; MOBILE ; STANDARD_RATE ; "digicel_guyana" ; "fmt1_3/4" ; "GY"
+63[35] ; 7 ; MOBILE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; ; ; "FILLUP THE MASTER RANGE"
634 ; 7 ; MOBILE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; ; IR21
-63[89] ; 7 ; MOBILE ; STANDARD_RATE ; "gt&t" ; "fmt1_3/4" ; "GY" ; ; IR21
-65[0-8] ; 7 ; MOBILE ; STANDARD_RATE ; "gt&t" ; "fmt1_3/4" ; "GY" ; ; IR21
-659 ; 7 ; MOBILE ; STANDARD_RATE ; "digicel_guyana" ; "fmt1_3/4" ; "GY" ; ; IR21
6[6-9] ; 7 ; MOBILE ; STANDARD_RATE ; "digicel_guyana" ; "fmt1_3/4" ; "GY" ; ; IR21
-70[0-3] ; 7 ; MOBILE ; STANDARD_RATE ; "digicel_guyana" ; "fmt1_3/4" ; "GY" ; ; IR21
-70[5-7] ; 7 ; MOBILE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; ; IR21
+70 ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
+71[0-8] ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
+725 ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
+749 ; 7 ; MOBILE ; STANDARD_RATE ; "gtt" ; "fmt1_3/4" ; "GY" ; ; IR21
77[14] ; 7 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY"
772 ; 7 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; "Lethem" ; ITU
773 ; 7 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_3/4" ; "GY" ; "Aishalton" ; ITU
diff --git a/resources/metadata/64/examples.csv b/resources/metadata/64/examples.csv
index 874d744ab..4b9874340 100644
--- a/resources/metadata/64/examples.csv
+++ b/resources/metadata/64/examples.csv
@@ -1,7 +1,6 @@
Region ; Type ; Number
NZ ; FIXED_LINE ; "32345678"
NZ ; MOBILE ; "211234567"
-NZ ; PAGER ; "86123456"
NZ ; TOLL_FREE ; "800123456"
NZ ; PREMIUM_RATE ; "900123456"
NZ ; PERSONAL_NUMBER ; "701234567"
diff --git a/resources/metadata/64/ranges.csv b/resources/metadata/64/ranges.csv
index 97a14e924..e94b5e8c5 100644
--- a/resources/metadata/64/ranges.csv
+++ b/resources/metadata/64/ranges.csv
@@ -1,5 +1,6 @@
Prefix ; Length ; Type ; Tariff ; Area Code Length ; Operator ; Format ; Timezone ; Regions ; Geocode:en ; Provenance ; Comment
11 ; 10 ; FIXED_LINE ; PREMIUM_RATE ; ; ; "mobile_2/3-4/4" ; "Pacific/Auckland" ; "NZ" ; ; ; "Added per client's request."
+1[3-57-9] ; 10 ; FIXED_LINE ; PREMIUM_RATE ; ; ; "mobile_2/3-4/4" ; "Pacific/Auckland" ; "NZ" ; ; GOVERNMENT
20[079] ; 9,10 ; MOBILE ; STANDARD_RATE ; ; ; "mobile_2/3-4/4" ; "Pacific/Auckland" ; "NZ" ; ; ; "FILLUP TO SUPPORT MASTER RANGE"
20[12] ; 9,10 ; MOBILE ; STANDARD_RATE ; ; "callplus" ; "mobile_2/3-4/4" ; "Pacific/Auckland" ; "NZ"
20[36] ; 9,10 ; MOBILE ; STANDARD_RATE ; ; "voyager" ; "mobile_2/3-4/4" ; "Pacific/Auckland" ; "NZ"
@@ -1922,12 +1923,13 @@ Prefix ; Length ; Type ; Tariff ; Area Code Length ; Op
8009[02-69] ; 9,10 ; FIXED_LINE ; TOLL_FREE ; ; ; "fmt_3/3/3-4" ; "Pacific/Auckland" ; "NZ" ; ; GOVERNMENT
8009[178] ; 9,10 ; FIXED_LINE ; TOLL_FREE ; ; ; "fmt_3/3/3-4" ; "Pacific/Auckland" ; "NZ" ; ; ; "FILLUP TO SUPPORT MASTER RANGE"
80[1-9] ; 9,10 ; FIXED_LINE ; TOLL_FREE ; ; ; "fmt_3/3/3-4" ; "Pacific/Auckland" ; "NZ" ; ; ; "FILLUP TO SUPPORT MASTER RANGE"
+811 ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ" ; ; GOVERNMENT
81[6-9] ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ"
822 ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ"
83 ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ" ; ; ; "Added per client's request."
84[045] ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ"
85[459] ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ"
-86 ; 8,9 ; PAGER ; STANDARD_RATE ; ; ; "mobile_2/3/3-5" ; "Pacific/Auckland" ; "NZ" ; ; ; "No Source"
+86[235-9] ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ" ; ; GOVERNMENT
87[0-3579] ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ"
890 ; 5-10 ; UAN ; STANDARD_RATE ; ; ; "uan_2/3-8" ; "Pacific/Auckland" ; "NZ"
90 ; 8 ; FIXED_LINE ; PREMIUM_RATE ; ; ; "fmt_3/2/2-3" ; "Pacific/Auckland" ; "NZ" ; ; ; "Added per client's request."
diff --git a/resources/metadata/880/comments.csv b/resources/metadata/880/comments.csv
index 30fb6d786..12580c016 100644
--- a/resources/metadata/880/comments.csv
+++ b/resources/metadata/880/comments.csv
@@ -10,3 +10,4 @@ BD ; XML_FIXED_LINE ; "It might be that lengths 6-8 are local numbers o
BD ; XML_FIXED_LINE ; "There was a plan to move to 10 digit fixed-line numbers, but this does not seem to have\nbeen realised, judging by online numbers and wikipedia. These patterns are grouped\nfirst by leading digit, then within by number of digits. Several Dhaka prefixes(02 731,\n02 890, 02 910, 02 550 etc.) are included despite not being mentioned on Wikipedia /\nITU due to online evidence. Another oddity is Chittagong - some numbers have a leading\n2, others do not - both are allowed for now. For some area codes, the subscriber number\nlength described in our source documentation doesn't match numbers online (e.g. 05222)\nso we allow both for now. (This applies to 0431, 04329, 04623, 05327 as well). We have\nalso added 04452 and 04923 from numbers found online. Included prefixes 2778, 2841, 2893,\n2963, 298[59] and 4462 as per user report. 9-digit 24 and 25 prefix numbers were added\nbased on user reports, although a doc from BRTC mentions that they are 10-digit numbers,\nwhich we think might be a typo."
BD ; XML_MOBILE ; "Presuming that mobile numbers with the prefixes 66, 37, 44 and 38 must be followed by\nnumbers [02-9] or they would clash with fixed-line codes. According to the plan, mobile\nnumbers should be moving to 1[13-9] anyway."
BD ; XML_TOLL_FREE ; "Note: Including Tele-voting numbers here as they are free of charge."
+BD ; XML_VOIP ; "Prefix 9643 added as per user report."
diff --git a/resources/metadata/880/ranges.csv b/resources/metadata/880/ranges.csv
index c07d6c100..5f42a82b1 100644
--- a/resources/metadata/880/ranges.csv
+++ b/resources/metadata/880/ranges.csv
@@ -319,6 +319,7 @@ Prefix ; Length ; Type ; Tariff ; Operator ;
960[469] ; 10 ; VOIP ; STANDARD_RATE ; ; "fmt_4/3-6" ; "BD" ; ; GOVERNMENT
961[0-47] ; 10 ; VOIP ; STANDARD_RATE ; ; "fmt_4/3-6" ; "BD" ; ; GOVERNMENT
963[389] ; 10 ; VOIP ; STANDARD_RATE ; ; "fmt_4/3-6" ; "BD" ; ; GOVERNMENT
+9643 ; 10 ; VOIP ; STANDARD_RATE ; ; "fmt_4/3-6" ; "BD" ; ; INTERNAL ; "User report"
966[69] ; 10 ; VOIP ; STANDARD_RATE ; ; "fmt_4/3-6" ; "BD" ; ; GOVERNMENT
967[78] ; 10 ; VOIP ; STANDARD_RATE ; ; "fmt_4/3-6" ; "BD" ; ; GOVERNMENT
981 ; 7 ; FIXED_LINE ; STANDARD_RATE ; ; "fixedline_3/3-7" ; "BD" ; "Jamalpur/Islampur/Dewanganj" ; ITU
diff --git a/resources/metadata/968/ranges.csv b/resources/metadata/968/ranges.csv
index 28828633f..81560e8a5 100644
--- a/resources/metadata/968/ranges.csv
+++ b/resources/metadata/968/ranges.csv
@@ -15,7 +15,7 @@ Prefix ; Length ; Type ; Tariff ; Operator ; Format ; R
26 ; 8 ; FIXED_LINE ; STANDARD_RATE ; ; "fmt1_2/6" ; "OM" ; "Al Batinah & Musandam" ; GOVERNMENT
500 ; 7 ; FIXED_LINE ; TOLL_FREE ; ; "fmt3_3/4-6" ; "OM" ; ; INTERNAL ; "Added based on client's request"
7[12] ; 8 ; MOBILE ; STANDARD_RATE ; "omantel" ; "fmt2_4/4" ; "OM" ; ; IR21
-769 ; 8 ; MOBILE ; STANDARD_RATE ; "vodafone" ; "fmt2_4/4" ; "OM" ; ; IR21
+76[89] ; 8 ; MOBILE ; STANDARD_RATE ; "vodafone" ; "fmt2_4/4" ; "OM" ; ; IR21
77[0-5] ; 8 ; MOBILE ; STANDARD_RATE ; "vodafone" ; "fmt2_4/4" ; "OM" ; ; IR21
78 ; 8 ; MOBILE ; STANDARD_RATE ; "ooredoo" ; "fmt2_4/4" ; "OM" ; ; IR21
79[0-6] ; 8 ; MOBILE ; STANDARD_RATE ; "ooredoo" ; "fmt2_4/4" ; "OM" ; ; IR21
diff --git a/resources/metadata/972/ranges.csv b/resources/metadata/972/ranges.csv
index 4e8322317..38c917a48 100644
--- a/resources/metadata/972/ranges.csv
+++ b/resources/metadata/972/ranges.csv
@@ -52,11 +52,11 @@ Prefix ; Length ; Type ; Tariff ; Area Code Length ; National
48[89] ; 8 ; FIXED_LINE ; STANDARD_RATE ; 1 ; false ; ; "fixed_1/3/4" ; "IL" ; "Haifa and North Regions" ; "חיפה והצפון" ; ; "Fill up to support master range"
49[02-467] ; 8 ; FIXED_LINE ; STANDARD_RATE ; 1 ; false ; ; "fixed_1/3/4" ; "IL" ; "Haifa and North Regions" ; "חיפה והצפון" ; ; "Fill up to support master range"
49[1589] ; 8 ; FIXED_LINE ; STANDARD_RATE ; 1 ; false ; ; "fixed_1/3/4" ; "IL" ; "Haifa and North Regions" ; "חיפה והצפון" ; GOVERNMENT
-50[2-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "pelephone" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
+50[02-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "pelephone" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
51[2-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "xphone" ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT
-52[2-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "cellcom" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
+52[02-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "cellcom" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
53 ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "hot_mobile" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
-54[2-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "orange" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
+54[2-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "orange" ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT
5501 ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "beezz" ; "mobile_2/3/4" ; "IL"
552[23] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "home_cellular" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
552[4-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "019mobile" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
@@ -75,7 +75,7 @@ Prefix ; Length ; Type ; Tariff ; Area Code Length ; National
558[7-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "pelephone" ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT
559[1-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "019mobile" ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT
56 ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "ooredoo" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
-58[3-7] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "golan_telecom" ; "mobile_2/3/4" ; "IL" ; ; ; IR21
+58[3-7] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "golan_telecom" ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT
59[2-9] ; 9 ; MOBILE ; STANDARD_RATE ; ; false ; "jawwal" ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT
718 ; 9 ; VOIP ; STANDARD_RATE ; ; false ; ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT
72[23] ; 9 ; VOIP ; STANDARD_RATE ; ; false ; ; "mobile_2/3/4" ; "IL" ; ; ; GOVERNMENT