diff --git a/scraper/data/all-by-country.json b/scraper/data/all-by-country.json
index c99e9cb..b320831 100644
--- a/scraper/data/all-by-country.json
+++ b/scraper/data/all-by-country.json
@@ -155,7 +155,7 @@
             "channel": "BBC WORLD NEWS",
             "link": "https://list.iptvcat.com/my_list/s/56041aada0c04df7f699ed0c956ee94a.m3u8",
             "country": "portugal",
-            "liveliness": "33",
+            "liveliness": "34",
             "status": "online",
             "lastChecked": "2022-05-06T00:00:00Z",
             "format": "sd",
@@ -179,11 +179,11 @@
             ]
         },
         {
-            "id": "2537855",
+            "id": "2522889",
             "channel": "Bbc World News",
-            "link": "https://list.iptvcat.com/my_list/s/efae1d8c1626e67b6b84fea4b2afb22e.m3u8",
+            "link": "https://list.iptvcat.com/my_list/s/ecb0a71a01766ad9b4c1a6ffe80acafb.m3u8",
             "country": "portugal",
-            "liveliness": "100",
+            "liveliness": "89",
             "status": "online",
             "lastChecked": "2022-05-06T00:00:00Z",
             "format": "sd",
@@ -193,11 +193,11 @@
             ]
         },
         {
-            "id": "2522889",
+            "id": "2537855",
             "channel": "Bbc World News",
-            "link": "https://list.iptvcat.com/my_list/s/ecb0a71a01766ad9b4c1a6ffe80acafb.m3u8",
+            "link": "https://list.iptvcat.com/my_list/s/efae1d8c1626e67b6b84fea4b2afb22e.m3u8",
             "country": "portugal",
-            "liveliness": "89",
+            "liveliness": "100",
             "status": "online",
             "lastChecked": "2022-05-06T00:00:00Z",
             "format": "sd",
@@ -325,9 +325,9 @@
             ]
         },
         {
-            "id": "2497119",
+            "id": "2497125",
             "channel": "BBC 2",
-            "link": "https://list.iptvcat.com/my_list/s/7d9b083d2546b0f411bf5128840f2ccc.m3u8",
+            "link": "https://list.iptvcat.com/my_list/s/83569b3aebe325ad6adfde341787d63a.m3u8",
             "country": "united kingdom",
             "liveliness": "100",
             "status": "online",
@@ -339,9 +339,9 @@
             ]
         },
         {
-            "id": "2497125",
+            "id": "2497119",
             "channel": "BBC 2",
-            "link": "https://list.iptvcat.com/my_list/s/83569b3aebe325ad6adfde341787d63a.m3u8",
+            "link": "https://list.iptvcat.com/my_list/s/7d9b083d2546b0f411bf5128840f2ccc.m3u8",
             "country": "united kingdom",
             "liveliness": "100",
             "status": "online",
@@ -366,20 +366,6 @@
                 "united_kingdom_-_-_-_-_-_-_-_"
             ]
         },
-        {
-            "id": "2531122",
-            "channel": "BBC 2 HD",
-            "link": "https://list.iptvcat.com/my_list/s/1856f43fab526fb07b3bdd5ae984f24d.m3u8",
-            "country": "united kingdom",
-            "liveliness": "91",
-            "status": "online",
-            "lastChecked": "2022-05-06T00:00:00Z",
-            "format": "sd",
-            "mbps": "2334",
-            "URI": [
-                "united_kingdom_-_-_-_-_-_-_-_"
-            ]
-        },
         {
             "id": "2538069",
             "channel": "BBC 2 HD",
@@ -394,6 +380,20 @@
                 "united_kingdom_-_-_-_-_-_-_-_"
             ]
         },
+        {
+            "id": "2531122",
+            "channel": "BBC 2 HD",
+            "link": "https://list.iptvcat.com/my_list/s/1856f43fab526fb07b3bdd5ae984f24d.m3u8",
+            "country": "united kingdom",
+            "liveliness": "92",
+            "status": "online",
+            "lastChecked": "2022-05-06T00:00:00Z",
+            "format": "sd",
+            "mbps": "2334",
+            "URI": [
+                "united_kingdom_-_-_-_-_-_-_-_"
+            ]
+        },
         {
             "id": "2531218",
             "channel": "BBC 3 HD",
@@ -1432,20 +1432,6 @@
                 "united_kingdom_-_-_-_-_-_-_-_"
             ]
         },
-        {
-            "id": "2538085",
-            "channel": "CBBC",
-            "link": "https://list.iptvcat.com/my_list/s/b07dd6e18e1fa10f629c9410c996c670.m3u8",
-            "country": "united kingdom",
-            "liveliness": "75",
-            "status": "online",
-            "lastChecked": "2022-05-06T00:00:00Z",
-            "format": "hd",
-            "mbps": "6241",
-            "URI": [
-                "united_kingdom_-_-_-_-_-_-_-_"
-            ]
-        },
         {
             "id": "2531236",
             "channel": "CBBC",
@@ -1460,12 +1446,26 @@
                 "united_kingdom_-_-_-_-_-_-_-_"
             ]
         },
+        {
+            "id": "2538085",
+            "channel": "CBBC",
+            "link": "https://list.iptvcat.com/my_list/s/b07dd6e18e1fa10f629c9410c996c670.m3u8",
+            "country": "united kingdom",
+            "liveliness": "80",
+            "status": "online",
+            "lastChecked": "2022-05-06T00:00:00Z",
+            "format": "fhd 2k",
+            "mbps": "7004",
+            "URI": [
+                "united_kingdom_-_-_-_-_-_-_-_"
+            ]
+        },
         {
             "id": "2528765",
             "channel": "CBBC HD UK",
             "link": "https://list.iptvcat.com/my_list/s/4caf9051ea56550b1d9701048f1f48ff.m3u8",
             "country": "united kingdom",
-            "liveliness": "30",
+            "liveliness": "27",
             "status": "offline",
             "lastChecked": "2022-05-06T00:00:00Z",
             "format": "hd",
@@ -1479,7 +1479,7 @@
             "channel": "UK FHD  BBC News",
             "link": "https://list.iptvcat.com/my_list/s/c774a4183ee73d4a3ca399270ee9a065.m3u8",
             "country": "united kingdom",
-            "liveliness": "33",
+            "liveliness": "25",
             "status": "offline",
             "lastChecked": "2022-05-06T00:00:00Z",
             "format": "hd",
@@ -1493,7 +1493,7 @@
             "channel": "UKFHD- BBC Two NI",
             "link": "https://list.iptvcat.com/my_list/s/ff46436c7e146bd8e422918121c8d889.m3u8",
             "country": "united kingdom",
-            "liveliness": "33",
+            "liveliness": "25",
             "status": "offline",
             "lastChecked": "2022-05-06T00:00:00Z",
             "format": "hd",
diff --git a/scraper/data/all-streams.json b/scraper/data/all-streams.json
index be995f7..e62519a 100644
--- a/scraper/data/all-streams.json
+++ b/scraper/data/all-streams.json
@@ -70,9 +70,9 @@
         ]
     },
     {
-        "id": "2497119",
+        "id": "2497125",
         "channel": "BBC 2",
-        "link": "https://list.iptvcat.com/my_list/s/7d9b083d2546b0f411bf5128840f2ccc.m3u8",
+        "link": "https://list.iptvcat.com/my_list/s/83569b3aebe325ad6adfde341787d63a.m3u8",
         "country": "united kingdom",
         "liveliness": "100",
         "status": "online",
@@ -84,9 +84,9 @@
         ]
     },
     {
-        "id": "2497125",
+        "id": "2497119",
         "channel": "BBC 2",
-        "link": "https://list.iptvcat.com/my_list/s/83569b3aebe325ad6adfde341787d63a.m3u8",
+        "link": "https://list.iptvcat.com/my_list/s/7d9b083d2546b0f411bf5128840f2ccc.m3u8",
         "country": "united kingdom",
         "liveliness": "100",
         "status": "online",
@@ -111,20 +111,6 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
-    {
-        "id": "2531122",
-        "channel": "BBC 2 HD",
-        "link": "https://list.iptvcat.com/my_list/s/1856f43fab526fb07b3bdd5ae984f24d.m3u8",
-        "country": "united kingdom",
-        "liveliness": "91",
-        "status": "online",
-        "lastChecked": "2022-05-06T00:00:00Z",
-        "format": "sd",
-        "mbps": "2334",
-        "URI": [
-            "united_kingdom_-_-_-_-_-_-_-_"
-        ]
-    },
     {
         "id": "2538069",
         "channel": "BBC 2 HD",
@@ -139,6 +125,20 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
+    {
+        "id": "2531122",
+        "channel": "BBC 2 HD",
+        "link": "https://list.iptvcat.com/my_list/s/1856f43fab526fb07b3bdd5ae984f24d.m3u8",
+        "country": "united kingdom",
+        "liveliness": "92",
+        "status": "online",
+        "lastChecked": "2022-05-06T00:00:00Z",
+        "format": "sd",
+        "mbps": "2334",
+        "URI": [
+            "united_kingdom_-_-_-_-_-_-_-_"
+        ]
+    },
     {
         "id": "2531218",
         "channel": "BBC 3 HD",
@@ -1177,20 +1177,6 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
-    {
-        "id": "2538085",
-        "channel": "CBBC",
-        "link": "https://list.iptvcat.com/my_list/s/b07dd6e18e1fa10f629c9410c996c670.m3u8",
-        "country": "united kingdom",
-        "liveliness": "75",
-        "status": "online",
-        "lastChecked": "2022-05-06T00:00:00Z",
-        "format": "hd",
-        "mbps": "6241",
-        "URI": [
-            "united_kingdom_-_-_-_-_-_-_-_"
-        ]
-    },
     {
         "id": "2531236",
         "channel": "CBBC",
@@ -1205,12 +1191,26 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
+    {
+        "id": "2538085",
+        "channel": "CBBC",
+        "link": "https://list.iptvcat.com/my_list/s/b07dd6e18e1fa10f629c9410c996c670.m3u8",
+        "country": "united kingdom",
+        "liveliness": "80",
+        "status": "online",
+        "lastChecked": "2022-05-06T00:00:00Z",
+        "format": "fhd 2k",
+        "mbps": "7004",
+        "URI": [
+            "united_kingdom_-_-_-_-_-_-_-_"
+        ]
+    },
     {
         "id": "2528765",
         "channel": "CBBC HD UK",
         "link": "https://list.iptvcat.com/my_list/s/4caf9051ea56550b1d9701048f1f48ff.m3u8",
         "country": "united kingdom",
-        "liveliness": "30",
+        "liveliness": "27",
         "status": "offline",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "hd",
@@ -1224,7 +1224,7 @@
         "channel": "UK FHD  BBC News",
         "link": "https://list.iptvcat.com/my_list/s/c774a4183ee73d4a3ca399270ee9a065.m3u8",
         "country": "united kingdom",
-        "liveliness": "33",
+        "liveliness": "25",
         "status": "offline",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "hd",
@@ -1238,7 +1238,7 @@
         "channel": "UKFHD- BBC Two NI",
         "link": "https://list.iptvcat.com/my_list/s/ff46436c7e146bd8e422918121c8d889.m3u8",
         "country": "united kingdom",
-        "liveliness": "33",
+        "liveliness": "25",
         "status": "offline",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "hd",
@@ -1462,7 +1462,7 @@
         "channel": "BBC WORLD NEWS",
         "link": "https://list.iptvcat.com/my_list/s/56041aada0c04df7f699ed0c956ee94a.m3u8",
         "country": "portugal",
-        "liveliness": "33",
+        "liveliness": "34",
         "status": "online",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "sd",
@@ -1486,11 +1486,11 @@
         ]
     },
     {
-        "id": "2537855",
+        "id": "2522889",
         "channel": "Bbc World News",
-        "link": "https://list.iptvcat.com/my_list/s/efae1d8c1626e67b6b84fea4b2afb22e.m3u8",
+        "link": "https://list.iptvcat.com/my_list/s/ecb0a71a01766ad9b4c1a6ffe80acafb.m3u8",
         "country": "portugal",
-        "liveliness": "100",
+        "liveliness": "89",
         "status": "online",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "sd",
@@ -1500,11 +1500,11 @@
         ]
     },
     {
-        "id": "2522889",
+        "id": "2537855",
         "channel": "Bbc World News",
-        "link": "https://list.iptvcat.com/my_list/s/ecb0a71a01766ad9b4c1a6ffe80acafb.m3u8",
+        "link": "https://list.iptvcat.com/my_list/s/efae1d8c1626e67b6b84fea4b2afb22e.m3u8",
         "country": "portugal",
-        "liveliness": "89",
+        "liveliness": "100",
         "status": "online",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "sd",
diff --git a/scraper/data/countries/portugal.json b/scraper/data/countries/portugal.json
index 1eb0ce7..83a830f 100644
--- a/scraper/data/countries/portugal.json
+++ b/scraper/data/countries/portugal.json
@@ -18,7 +18,7 @@
         "channel": "BBC WORLD NEWS",
         "link": "https://list.iptvcat.com/my_list/s/56041aada0c04df7f699ed0c956ee94a.m3u8",
         "country": "portugal",
-        "liveliness": "33",
+        "liveliness": "34",
         "status": "online",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "sd",
@@ -41,20 +41,6 @@
             "s"
         ]
     },
-    {
-        "id": "2537855",
-        "channel": "Bbc World News",
-        "link": "https://list.iptvcat.com/my_list/s/efae1d8c1626e67b6b84fea4b2afb22e.m3u8",
-        "country": "portugal",
-        "liveliness": "100",
-        "status": "online",
-        "lastChecked": "2022-05-06T00:00:00Z",
-        "format": "sd",
-        "mbps": "2334",
-        "URI": [
-            "s"
-        ]
-    },
     {
         "id": "2522889",
         "channel": "Bbc World News",
@@ -68,5 +54,19 @@
         "URI": [
             "s"
         ]
+    },
+    {
+        "id": "2537855",
+        "channel": "Bbc World News",
+        "link": "https://list.iptvcat.com/my_list/s/efae1d8c1626e67b6b84fea4b2afb22e.m3u8",
+        "country": "portugal",
+        "liveliness": "100",
+        "status": "online",
+        "lastChecked": "2022-05-06T00:00:00Z",
+        "format": "sd",
+        "mbps": "2334",
+        "URI": [
+            "s"
+        ]
     }
 ]
\ No newline at end of file
diff --git a/scraper/data/countries/united kingdom.json b/scraper/data/countries/united kingdom.json
index 82f0d93..d1bff05 100644
--- a/scraper/data/countries/united kingdom.json	
+++ b/scraper/data/countries/united kingdom.json	
@@ -70,9 +70,9 @@
         ]
     },
     {
-        "id": "2497119",
+        "id": "2497125",
         "channel": "BBC 2",
-        "link": "https://list.iptvcat.com/my_list/s/7d9b083d2546b0f411bf5128840f2ccc.m3u8",
+        "link": "https://list.iptvcat.com/my_list/s/83569b3aebe325ad6adfde341787d63a.m3u8",
         "country": "united kingdom",
         "liveliness": "100",
         "status": "online",
@@ -84,9 +84,9 @@
         ]
     },
     {
-        "id": "2497125",
+        "id": "2497119",
         "channel": "BBC 2",
-        "link": "https://list.iptvcat.com/my_list/s/83569b3aebe325ad6adfde341787d63a.m3u8",
+        "link": "https://list.iptvcat.com/my_list/s/7d9b083d2546b0f411bf5128840f2ccc.m3u8",
         "country": "united kingdom",
         "liveliness": "100",
         "status": "online",
@@ -111,20 +111,6 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
-    {
-        "id": "2531122",
-        "channel": "BBC 2 HD",
-        "link": "https://list.iptvcat.com/my_list/s/1856f43fab526fb07b3bdd5ae984f24d.m3u8",
-        "country": "united kingdom",
-        "liveliness": "91",
-        "status": "online",
-        "lastChecked": "2022-05-06T00:00:00Z",
-        "format": "sd",
-        "mbps": "2334",
-        "URI": [
-            "united_kingdom_-_-_-_-_-_-_-_"
-        ]
-    },
     {
         "id": "2538069",
         "channel": "BBC 2 HD",
@@ -139,6 +125,20 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
+    {
+        "id": "2531122",
+        "channel": "BBC 2 HD",
+        "link": "https://list.iptvcat.com/my_list/s/1856f43fab526fb07b3bdd5ae984f24d.m3u8",
+        "country": "united kingdom",
+        "liveliness": "92",
+        "status": "online",
+        "lastChecked": "2022-05-06T00:00:00Z",
+        "format": "sd",
+        "mbps": "2334",
+        "URI": [
+            "united_kingdom_-_-_-_-_-_-_-_"
+        ]
+    },
     {
         "id": "2531218",
         "channel": "BBC 3 HD",
@@ -1177,20 +1177,6 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
-    {
-        "id": "2538085",
-        "channel": "CBBC",
-        "link": "https://list.iptvcat.com/my_list/s/b07dd6e18e1fa10f629c9410c996c670.m3u8",
-        "country": "united kingdom",
-        "liveliness": "75",
-        "status": "online",
-        "lastChecked": "2022-05-06T00:00:00Z",
-        "format": "hd",
-        "mbps": "6241",
-        "URI": [
-            "united_kingdom_-_-_-_-_-_-_-_"
-        ]
-    },
     {
         "id": "2531236",
         "channel": "CBBC",
@@ -1205,12 +1191,26 @@
             "united_kingdom_-_-_-_-_-_-_-_"
         ]
     },
+    {
+        "id": "2538085",
+        "channel": "CBBC",
+        "link": "https://list.iptvcat.com/my_list/s/b07dd6e18e1fa10f629c9410c996c670.m3u8",
+        "country": "united kingdom",
+        "liveliness": "80",
+        "status": "online",
+        "lastChecked": "2022-05-06T00:00:00Z",
+        "format": "fhd 2k",
+        "mbps": "7004",
+        "URI": [
+            "united_kingdom_-_-_-_-_-_-_-_"
+        ]
+    },
     {
         "id": "2528765",
         "channel": "CBBC HD UK",
         "link": "https://list.iptvcat.com/my_list/s/4caf9051ea56550b1d9701048f1f48ff.m3u8",
         "country": "united kingdom",
-        "liveliness": "30",
+        "liveliness": "27",
         "status": "offline",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "hd",
@@ -1224,7 +1224,7 @@
         "channel": "UK FHD  BBC News",
         "link": "https://list.iptvcat.com/my_list/s/c774a4183ee73d4a3ca399270ee9a065.m3u8",
         "country": "united kingdom",
-        "liveliness": "33",
+        "liveliness": "25",
         "status": "offline",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "hd",
@@ -1238,7 +1238,7 @@
         "channel": "UKFHD- BBC Two NI",
         "link": "https://list.iptvcat.com/my_list/s/ff46436c7e146bd8e422918121c8d889.m3u8",
         "country": "united kingdom",
-        "liveliness": "33",
+        "liveliness": "25",
         "status": "offline",
         "lastChecked": "2022-05-06T00:00:00Z",
         "format": "hd",