diff --git a/streams/ae.m3u b/streams/ae.m3u
index 94b16cfee..fc9a166a5 100644
--- a/streams/ae.m3u
+++ b/streams/ae.m3u
@@ -15,8 +15,6 @@ https://live.alarabiya.net/alarabiapublish/alarabiya.smil/playlist.m3u8
 https://mbc1-enc.edgenextcdn.net/out/v1/f5f319206ed740f9a831f2097c2ead23/index.m3u8
 #EXTINF:-1 tvg-id="AlArabiyaBusiness.ae",Al Arabiya Business (1080p)
 https://live.alarabiya.net/alarabiapublish/aswaaq.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Al Arabiya Programs (1080p)
-https://d1j4r34gq3qw9y.cloudfront.net/out/v1/96804f3a14864641a21c25e8ca9afb74/index.m3u8
 #EXTINF:-1 tvg-id="AlMashhad.ae",Al Mashhad (1080p)
 https://bcovlive-a.akamaihd.net/20c3ca22be3c4f03b30afbf3c92cfd14/ap-south-1/6313884884001/playlist.m3u8
 #EXTINF:-1 tvg-id="AlQamarTV.ae",Al Qamar TV (360p)
@@ -27,10 +25,10 @@ https://amg01480-alshallalfze-alshallal-ono-q0hfg.amagi.tv/playlist.m3u8
 https://svs.itworkscdn.net/kablatvlive/kabtv1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlWoustaTV.ae",Al Wousta TV (1080p)
 https://svs.itworkscdn.net/alwoustalive/alwoustatv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="AlYaumTV.ae",Al Yaum TV (1080p)
-https://iko-live.akamaized.net/AlyuamTV/master.m3u8
 #EXTINF:-1 tvg-id="AlYaumTV.ae",Al Yaum TV (720p)
 https://alyaum-tv.akamaized.net/hls/alyaum-tv.m3u8
+#EXTINF:-1 tvg-id="AlYaumTV.ae",Al Yaum TV (1080p)
+https://iko-live.akamaized.net/AlyuamTV/master.m3u8
 #EXTINF:-1 tvg-id="AlarabiyaPortrait.ae",Alarabiya Portrait (720p)
 https://live.alarabiya.net/alarabiapublish/arabiav.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="BaynounahTV.ae",Baynounah TV (1080p)
@@ -135,3 +133,5 @@ https://vo-live.cdb.cdn.orange.com/Content/Channel/YASSportsChannel/HLS/index.m3
 https://weyyak-live.akamaized.net/weyyak_zee_aflam/index.m3u8
 #EXTINF:-1 tvg-id="ZeeAlwan.in",Zee Alwan (720p) [Geo-blocked]
 https://weyyak-live.akamaized.net/weyyak_zee_alwan/index.m3u8
+#EXTINF:-1 tvg-id="AlArabiyaPrograms.ae",Al Arabiya Programs (1080p)
+https://d1j4r34gq3qw9y.cloudfront.net/out/v1/96804f3a14864641a21c25e8ca9afb74/index.m3u8
diff --git a/streams/af.m3u b/streams/af.m3u
index 53957dead..1acce1ef6 100644
--- a/streams/af.m3u
+++ b/streams/af.m3u
@@ -31,17 +31,17 @@ https://playout395.livestreamingcdn.com/live/Stream1/playlist.m3u8
 https://www.hewadwal.com:19360/noortv_abr/noortv_abr.m3u8
 #EXTINF:-1 tvg-id="RTA.af",RTA (1080p)
 https://rtatv.akamaized.net/Content/HLS/Live/channel(RTA1)/index.m3u8
-#EXTINF:-1 tvg-id="",RTA Education (1080p)
+#EXTINF:-1 tvg-id="RTAEducation.af",RTA Education (1080p)
 https://rtatv.akamaized.net/Content/HLS/Live/channel(RTA4)/index.m3u8
-#EXTINF:-1 tvg-id="",RTA News (1080p)
+#EXTINF:-1 tvg-id="RTANews.af",RTA News (1080p)
 https://rtatv.akamaized.net/Content/HLS/Live/channel(RTA2)/index.m3u8
 #EXTINF:-1 tvg-id="RTASport.af",RTA Sport (1080p)
 https://rtatv.akamaized.net/Content/HLS/Live/channel(RTA3)/index.m3u8
-#EXTINF:-1 tvg-id="",Shams TV
-https://fflive-darya-educationtv.b-cdn.net/master.m3u8
 #EXTINF:-1 tvg-id="SharqRadioTV.af",Sharq Radio TV (1080p)
 https://59nyqa5elwap-hls-live.5centscdn.com/Sharq/eec89088ee408b80387155272b113256.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TamadonTV.af",Tamadon TV (720p)
 https://hls.tamadon.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="TOLOnews.af",Tolo News (720p)
 https://raw.githubusercontent.com/taodicakhia/IPTV_Exception/master/channels/af/tolonews.m3u8
+#EXTINF:-1 tvg-id="ShamsTV.af",Shams TV
+https://fflive-darya-educationtv.b-cdn.net/master.m3u8
diff --git a/streams/am.m3u b/streams/am.m3u
index 19f4910ae..0c9664fa5 100644
--- a/streams/am.m3u
+++ b/streams/am.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",ARTN TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ARTNTV.us",ARTN TV (1080p) [Not 24/7]
 https://streamer1.connectto.com/ARTN_mobile/index.m3u8
 #EXTINF:-1 tvg-id="FirstChannelNews.am",First Channel News (1080p)
 https://amtv1-2.livestreamingcdn.com/am3abr/index.m3u8
diff --git a/streams/ar.m3u b/streams/ar.m3u
index 9d364041c..6bc32538e 100644
--- a/streams/ar.m3u
+++ b/streams/ar.m3u
@@ -28,7 +28,7 @@ http://51.79.83.93:9998/live/am1020/playlist.m3u8
 #EXTINF:-1 tvg-id="AmericaTV.ar" user-agent="iPhone",América TV (720p)
 #EXTVLCOPT:http-user-agent=iPhone
 https://raw.githubusercontent.com/MachineSystems/archived_m3u8/main/america_hls.m3u8
-#EXTINF:-1 tvg-id="",ANIMESTATION (Argentina) (720p)
+#EXTINF:-1 tvg-id="ANIMESTATION.ar",ANIMESTATION (Argentina) (720p)
 https://ssh101-fl.bozztv.com/ssh101/livestreamingtv/index.m3u8
 #EXTINF:-1 tvg-id="Antena91.ar",Antena 91 (720p)
 https://tuvideoonline.com.ar:3393/live/antena91live.m3u8
@@ -106,7 +106,7 @@ https://stream.arcast.com.ar/canal5picotruncado/canal5picotruncado/playlist.m3u8
 https://stream.arcast.com.ar/c5sf/c5sf/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal5Tucuman.ar",Canal 5 Tucumán (480p)
 https://videohd.live:19360/8090/8090.m3u8
-#EXTINF:-1 tvg-id="",Canal 6 Mar del Plata (480p)
+#EXTINF:-1 tvg-id="Canal6MardelPlata.ar",Canal 6 Mar del Plata (480p)
 https://panel.dattalive.com/8166/8166/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal6Moreno.ar",Canal 6 Moreno (720p) [Not 24/7]
 https://stream.arcast.com.ar/canal6moreno/canal6moreno/playlist.m3u8
@@ -292,15 +292,15 @@ https://panel.dattalive.com/8066/8066/playlist.m3u8
 https://538d0bde28ccf.streamlock.net/live-cont.ar/deportv/playlist.m3u8
 #EXTINF:-1 tvg-id="DirecTVSports.ar",DirecTV Sports (480p) [Geo-blocked]
 http://190.210.221.119/Processor3_9_chunklist_b1300000.m3u8
-#EXTINF:-1 tvg-id="",Disney Channel Latin America (480p)
+#EXTINF:-1 tvg-id="DisneyChannelLatinAmerica.ar",Disney Channel Latin America (480p)
 http://168.181.122.234:8000/play/a038/index.m3u8
-#EXTINF:-1 tvg-id="",Disney Junior Latin America (480p)
+#EXTINF:-1 tvg-id="DisneyJuniorLatinAmerica.ar",Disney Junior Latin America (480p)
 http://168.181.122.234:8000/play/a037/index.m3u8
 #EXTINF:-1 tvg-id="EcoTV.ar",Eco TV (720p)
 https://stream.arcast.com.ar/ecotv/ngrp:ecotv_all/playlist.m3u8
 #EXTINF:-1 tvg-id="ElHistonautaTV.ar",El Histonauta TV (360p)
 https://stmv1.cnarlatam.com/elhistonauta/elhistonauta/playlist.m3u8
-#EXTINF:-1 tvg-id="",El Palomar TV (720p)
+#EXTINF:-1 tvg-id="ElPalomarTV.ar",El Palomar TV (720p)
 https://stream.trixserver.com:3249/live/uv038live.m3u8
 #EXTINF:-1 tvg-id="ElSelloTVMadariaga.ar",El SelloTV Madariaga (720p)
 https://5f700d5b2c46f.streamlock.net/elsellotv/elsellotv/playlist.m3u8
diff --git a/streams/at.m3u b/streams/at.m3u
index 7ad536d39..b15c03e54 100644
--- a/streams/at.m3u
+++ b/streams/at.m3u
@@ -19,7 +19,7 @@ https://studiocam-oe3.mdn.ors.at/out/u/studiocam_oe3/q6a/manifest_1.m3u8
 https://1853185335.rsc.cdn77.org/K192/tv/playlist.m3u8
 #EXTINF:-1 tvg-id="KTV.at",K-TV (720p)
 https://d1pz8zear993v8.cloudfront.net/hlsme/kathtv.m3u8
-#EXTINF:-1 tvg-id="",KIT-TV (720p)
+#EXTINF:-1 tvg-id="KITTV.at",KIT-TV (720p)
 https://everest.pa-hosting.de:3591/live/joseflive.m3u8
 #EXTINF:-1 tvg-id="kronetv.at",Krone.TV (360p)
 https://kronetv.mdn.ors.at/out/u/kronetv-nodrm.m3u8
diff --git a/streams/at_plutotv.m3u b/streams/at_plutotv.m3u
index 2c8ce0da6..2e1c66924 100644
--- a/streams/at_plutotv.m3u
+++ b/streams/at_plutotv.m3u
@@ -53,7 +53,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5a4bb7da5c0007e5c9e9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee81-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=463074db-dca9-4056-97f7-eda9fddb9e5f
 #EXTINF:-1 tvg-id="",Car Chase
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a93a9d3af63d00082c4850/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee82-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=851800ef-7ea9-4860-b74b-c1fdff346372
-#EXTINF:-1 tvg-id="",CBS News 24/7
+#EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62441d6ded1827000763dcda/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee83-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=4bddfb08-ac57-4769-a092-8bfc7ce71e23
 #EXTINF:-1 tvg-id="",CC Made in Germany
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d4948418101147596fd6c5a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=1b1cee84-4b81-11ef-a8ac-e146e4e7be02&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b7523d3b-53d5-4c5c-a4fe-a4665e244aaa
diff --git a/streams/au.m3u b/streams/au.m3u
index 02cfdc03b..c3d434329 100644
--- a/streams/au.m3u
+++ b/streams/au.m3u
@@ -17,8 +17,6 @@ https://9now-livestreams.akamaized.net/hls/live/2008313/life-syd/master.m3u8
 https://9now-livestreams.akamaized.net/hls/live/2010626/rush-syd/master.m3u8
 #EXTINF:-1 tvg-id="10BoldSydney.au",10 Bold (720p) [Geo-blocked]
 https://i.mjh.nz/10bold-nsw.m3u8
-#EXTINF:-1 tvg-id="10BoldAdelaide.au",10 Bold Adelaide (1080p)
-https://dce3793146fef017.mediapackage.us-west-2.amazonaws.com/out/v1/55cdf73af7894775ba6de8f57482b66a/CMAF_HLS/index.m3u8
 #EXTINF:-1 tvg-id="10PeachSydney.au",10 Peach (720p) [Geo-blocked]
 https://i.mjh.nz/10peach-nsw.m3u8
 #EXTINF:-1 tvg-id="ABCMESydney.au",ABC Me (720p)
@@ -69,7 +67,7 @@ https://d1k6kax80wecy5.cloudfront.net/WFqZJc/index.m3u8
 https://tvsnhlslivetest.akamaized.net/hls/live/2034711/EXPO-MSL4/master.m3u8
 #EXTINF:-1 tvg-id="HopeChannelAustralia.au",Hope Channel Australia (1080p)
 https://videodelivery.net/9fb3596948ddf463fde0ec4b85625b24/manifest/video.m3u8
-#EXTINF:-1 tvg-id="",Indo Oz TV (720p)
+#EXTINF:-1 tvg-id="IndoOzTV.au",Indo Oz TV (720p)
 https://stream.e2is.in/hls/indoztv.m3u8
 #EXTINF:-1 tvg-id="JonmoBhumiTV.au",JonmoBhumi TV (720p) [Not 24/7]
 https://us170.jagobd.com:447/c3VydmVyX8RpbEU9Mi8xNy8yMDE0GIDU6RgzQ6NTAgdEoaeFzbF92YWxIZTO0U0ezN1IzMyfvcGVMZEJCTEFWeVN3PTOmdFsaWRtaW51aiPhnPTI/jonmobhumitv.stream/playlist.m3u8
@@ -97,9 +95,13 @@ https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg01486-tickernews-tickernewsweb-ono/
 https://nrpus.bozztv.com/36bay2/gusa-moviemagictv/index.m3u8
 #EXTINF:-1 tvg-id="TVSN.au",TVSN (1080p)
 https://tvsnhlslivetest.akamaized.net/hls/live/2034711/TVSN-MSL4/master.m3u8
-#EXTINF:-1 tvg-id="",TVSN Beauty (1080p)
+#EXTINF:-1 tvg-id="10BoldAdelaide.au",10 Bold Adelaide (1080p)
+https://dce3793146fef017.mediapackage.us-west-2.amazonaws.com/out/v1/55cdf73af7894775ba6de8f57482b66a/CMAF_HLS/index.m3u8
+#EXTINF:-1 tvg-id="TVSNBeauty.au",TVSN Beauty (1080p)
 https://live-tvsn.simplestreamcdn.com/live12/tvsnbeauty/bitrate1.isml/.m3u8
 #EXTINF:-1 tvg-id="",TVSN Catchup TV (1080p)
 https://tvsnshowsvod.akamaized.net/CatchUpTV/TVSN-AU/2411171630/TVSN_2411171630.m3u8
-#EXTINF:-1 tvg-id="",TVSN Jewellery (1080p)
+#EXTINF:-1 tvg-id="TVSNJewellery.au",TVSN Jewellery (1080p)
 https://live-tvsn.simplestreamcdn.com/live13/tvsnjewellery/bitrate1.isml/.m3u8
+#EXTINF:-1 tvg-id="TVSNStyle.au",TVSN Style (1080p)
+https://tvsnhlslivetest.akamaized.net/hls/live/2034711/TVSN-MSL4/master.m3u8
diff --git a/streams/aw.m3u b/streams/aw.m3u
index cec26aa93..e4b187adb 100644
--- a/streams/aw.m3u
+++ b/streams/aw.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",ArubaTV + (720p)
+#EXTINF:-1 tvg-id="ArubaTVPlus.aw",ArubaTV + (720p)
 https://5caf24a595d94.streamlock.net:1937/kmdbgtygtx/kmdbgtygtx/playlist.m3u8
 #EXTINF:-1 tvg-id="CoolFM989.aw",Cool FM 98.9 (720p)
 https://live2.tensila.com/cool-v-1.arubara/hls/master.m3u8
diff --git a/streams/az.m3u b/streams/az.m3u
index bd6000605..8e1892ace 100644
--- a/streams/az.m3u
+++ b/streams/az.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Agro TV Azerbaijan (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="AgroTVAzerbaijan.az",Agro TV Azerbaijan (1080p) [Not 24/7]
 https://yayin30.haber100.com/live/agrotv2/playlist.m3u8
 #EXTINF:-1 tvg-id="AlvinChannelTV.az",Alvin Channel TV (360p) [Not 24/7]
 https://cdn10-alvinchannel.yayin.com.tr/alvinchannel/alvinchannel/playlist.m3u8
@@ -41,5 +41,5 @@ https://cdn10-mugantv.yayin.com.tr/mugantv/mugantv/playlist.m3u8
 https://str1.yodacdn.net/qafkaz/playlist.m3u8
 #EXTINF:-1 tvg-id="RealTV.az",Real TV [Geo-blocked]
 https://str.yodacdn.net/real/playlist.m3u8
-#EXTINF:-1 tvg-id="",Show Plus TV (720p)
+#EXTINF:-1 tvg-id="ShowPlusTV.az",Show Plus TV (720p)
 https://glb.bozztv.com/glb/ssh101/showplus/index.m3u8
diff --git a/streams/ba.m3u b/streams/ba.m3u
index df44e454e..194a7c6a2 100644
--- a/streams/ba.m3u
+++ b/streams/ba.m3u
@@ -29,7 +29,7 @@ https://restreamer2.tnt.ba/hls/stream.m3u8
 https://mirtv.club/live/mirtv/index.m3u8
 #EXTINF:-1 tvg-id="Televizija5.ba",Televizija 5 (576p)
 https://balkanmedia.dynu.net/hls/tv5web.m3u8
-#EXTINF:-1 tvg-id="",Televizija M (1080p)
+#EXTINF:-1 tvg-id="TelevizijaM.ba",Televizija M (1080p)
 https://live.tv-m.net/hls/stream.m3u8
 #EXTINF:-1 tvg-id="TNTKidsTV.ba",TNT Kids (288p)
 https://restreamer1.tnt.ba/hls/tntkids.m3u8
diff --git a/streams/bd.m3u b/streams/bd.m3u
index 0a05201ca..11c2bebb1 100644
--- a/streams/bd.m3u
+++ b/streams/bd.m3u
@@ -9,19 +9,19 @@ https://www.btvlive.gov.bd/streams/ef8b8bbc-98b7-4ba7-a49d-a0adaf259d35/ES/355ba
 https://www.btvlive.gov.bd/streams/ef8b8bbc-98b7-4ba7-a49d-a0adaf259d35/ES/d96eb7f4-83c2-4472-9597-3568390a8ebf/d96eb7f4-83c2-4472-9597-3568390a8ebf_3_playlist.m3u8
 #EXTINF:-1 tvg-id="ChannelS.bd",Channel S (1080p)
 https://amigofx.com:1936/channelsreporter/channelsreporter/playlist.m3u8
-#EXTINF:-1 tvg-id="",Deshi TV (720p)
+#EXTINF:-1 tvg-id="DeshiTV.ca",Deshi TV (720p)
 https://deshitv.deshitv24.net/live/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="ETenTV.bd",E Ten TV (1080p) [Not 24/7]
 https://iptvbd.live/test/1080.m3u8
 #EXTINF:-1 tvg-id="EkusheyTV.bd",Ekushey TV (480p)
 https://ekusheyserver.com/etvlivesn.m3u8
+#EXTINF:-1 tvg-id="JaTV.bd",JaTV (720p)
+https://cloud2.smartsolbd.com/live/jatvbd/index.m3u8
 #EXTINF:-1 tvg-id="JamunaTV.bd",Jamuna TV (720p) [Geo-blocked]
 http://113.212.111.246:8080/hls/col12.m3u8
-#EXTINF:-1 tvg-id="",JaTV (720p)
-https://cloud2.smartsolbd.com/live/jatvbd/index.m3u8
-#EXTINF:-1 tvg-id="",Probashi TV News (720p)
+#EXTINF:-1 tvg-id="ProbashiTVNews.ca",Probashi TV News (720p)
 http://probashi.alvegroups.com:8081/probashitv/probashi/playlist.m3u8
-#EXTINF:-1 tvg-id="",Sangsad TV (1080p)
+#EXTINF:-1 tvg-id="SangsadTV.bd",Sangsad TV (1080p)
 https://www.btvlive.gov.bd/streams/ef8b8bbc-98b7-4ba7-a49d-a0adaf259d35/ES/9ee3b4f9-fd0a-47c5-a135-2575c5691613/9ee3b4f9-fd0a-47c5-a135-2575c5691613_3_playlist.m3u8
-#EXTINF:-1 tvg-id="",Vokta TV (720p)
+#EXTINF:-1 tvg-id="VoktaTV.bd",Vokta TV (720p)
 https://vokta.raytahost.com/live/voktatv/index.m3u8
diff --git a/streams/be.m3u b/streams/be.m3u
index ae9218152..e16c7a319 100644
--- a/streams/be.m3u
+++ b/streams/be.m3u
@@ -25,7 +25,7 @@ https://eucom-live.freecaster.com/eucom/96098c0b-0743-4afc-9562-db1673053f9d/960
 https://raw.githubusercontent.com/Sphinxroot/HSL/main/DM/be/FunRadio.m3u8
 #EXTINF:-1 tvg-id="HLNLive.be",HLN Live (720p)
 https://dpg-eventstreams.akamaized.net/hlnlivesrt-xmr/streamx/hlnlivesrt_720p.m3u8
-#EXTINF:-1 tvg-id="",Japanim TV (1080p)
+#EXTINF:-1 tvg-id="JapanimTV.be",Japanim TV (1080p)
 https://foxkidstv.be:3369/stream/play.m3u8
 #EXTINF:-1 tvg-id="JoeFM.be",Joe FM (720p) [Not 24/7]
 https://dpp-streamlive-plain.medialaancdn.be/joe_kijklive/plain/hls_hd.m3u8
diff --git a/streams/be_samsung.m3u b/streams/be_samsung.m3u
index bd8e95619..020735219 100644
--- a/streams/be_samsung.m3u
+++ b/streams/be_samsung.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",AfricaNews Français (720p)
+#EXTINF:-1 tvg-id="AfricanewsFrench.fr",AfricaNews Français (720p)
 https://rakuten-africanews-2-be.samsung.wurl.tv/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="AFVFamily.us",AFV Family
 https://futuretoday-afv-family-2-be.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/bg.m3u b/streams/bg.m3u
index 80360fad1..cf9431e42 100644
--- a/streams/bg.m3u
+++ b/streams/bg.m3u
@@ -21,7 +21,7 @@ http://46.249.95.140:8081/hls/data.m3u8
 https://eurofolk.cdn.netbadgers.com/bg040/bg041/bg041.m3u8
 #EXTINF:-1 tvg-id="Eurocom.bg",Evrokom (360p)
 https://live.ecomservice.bg/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",Hope Channel Bulgaria
+#EXTINF:-1 tvg-id="HopeChannelBulgaria.bg",Hope Channel Bulgaria
 https://hc1.hopetv.bg/live/hopetv_all.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal0.bg",Kanal 0
 #EXTVLCOPT:http-referrer=rn-tv.com
diff --git a/streams/bj.m3u b/streams/bj.m3u
index e7d22d512..6d3ab2f9a 100644
--- a/streams/bj.m3u
+++ b/streams/bj.m3u
@@ -3,7 +3,7 @@
 https://stream01.adotv-fm.bj/ado-tv-live/index.m3u8
 #EXTINF:-1 tvg-id="BB24.bj",BB 24 (720p) [Not 24/7]
 https://edge15.vedge.infomaniak.com/livecast/ik:bb24-1/playlist.m3u8
-#EXTINF:-1 tvg-id="",Bénin Web TV (720p)
+#EXTINF:-1 tvg-id="BeninWebTV.bj",Bénin Web TV (720p)
 https://vdo.pro-fhi.net:3244/stream/play.m3u8
 #EXTINF:-1 tvg-id="Canal3Benin.bj",Canal 3 Bénin (720p)
 https://live.creacast.com/bluediamond/stream/playlist.m3u8
@@ -13,17 +13,17 @@ https://rtmp.edentv.bj/hls/stream.m3u8
 https://livetvsteam.com:1936/etelebenin/etelebenin/playlist.m3u8
 #EXTINF:-1 tvg-id="HopeTVBenin.bj",Hope TV Bénin (576p)
 https://webstreaming-6.viewmedia.tv/web_090/Stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",KassouaTV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="KassouaTV.bj",KassouaTV (480p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/kassouatvstream/playlist.m3u8
 #EXTINF:-1 tvg-id="MECTV.bj",MEC TV (576p) [Not 24/7]
 https://webstreaming.viewmedia.tv/web_004/Stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",NEK4 Culture (480p)
+#EXTINF:-1 tvg-id="NEK4Culture.bj",NEK4 Culture (480p)
 https://helga.iptv2022.com/sh/NEK4/index.m3u8
-#EXTINF:-1 tvg-id="",Nord Benin TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="NordBeninTV.bj",Nord Benin TV (480p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/nordbenintv/playlist.m3u8
 #EXTINF:-1 tvg-id="ORTBTV.bj",ORTB TV (720p) [Not 24/7]
 https://strhls.streamakaci.tv/ortb/ortb1-multi/playlist.m3u8
-#EXTINF:-1 tvg-id="",Soleil Levant TV (720p)
+#EXTINF:-1 tvg-id="SoleilLevantTV.bj",Soleil Levant TV (720p)
 https://helga.iptv2022.com/sh/SOLEIL_LEVANT_TV/index.m3u8
 #EXTINF:-1 tvg-id="TVCBenin.bj",TVC Bénin (720p)
 https://helga.iptv2022.com/sh/TVC_BENIN/index.m3u8
diff --git a/streams/bo.m3u b/streams/bo.m3u
index 6f915cda6..e59820e17 100644
--- a/streams/bo.m3u
+++ b/streams/bo.m3u
@@ -3,13 +3,13 @@
 https://master.tucableip.com/abyayalatv/playlist.m3u8
 #EXTINF:-1 tvg-id="AgendaMineraTV.bo",Agenda Minera TV (720p)
 https://srv.panelcast.net/amitel/amitel/playlist.m3u8
-#EXTINF:-1 tvg-id="",ANTv (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ANTv.bo",ANTv (720p) [Not 24/7]
 http://181.188.144.141/tmp_hls/ant_tv/index.m3u8
 #EXTINF:-1 tvg-id="ATBLaPaz.bo",ATB La Paz (614p) [Not 24/7]
 http://186.121.206.197/live/daniel/index.m3u8
 #EXTINF:-1 tvg-id="ATBSantaCruz.bo",ATB Santa Cruz (720p) [Not 24/7]
 https://cdn.digital.com.bo/__cl/cg:sworigin2/__c/ATB/__op/hls-default/__f/index.m3u8
-#EXTINF:-1 tvg-id="",Atesur (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Atesur.bo",Atesur (1080p) [Not 24/7]
 https://video2.getstreamhosting.com:19360/8038/8038.m3u8
 #EXTINF:-1 tvg-id="AYNITV.bo",AYNI TV (720p)
 https://stmvideo3.livecastv.com/aynitv/aynitv/playlist.m3u8
@@ -25,7 +25,7 @@ https://video1.getstreamhosting.com:1936/8224/8224/playlist.m3u8
 https://alba-bo-bolivision-bolivision.stream.mediatiquestream.com/index.m3u8
 #EXTINF:-1 tvg-id="CadenaA.bo",Cadena A (720p) [Not 24/7]
 https://5fe2654d6127d.streamlock.net/cadenaa/videocadenaa/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 29 TVA (720p)
+#EXTINF:-1 tvg-id="Canal29TVA.bo",Canal 29 TVA (720p)
 https://vdo.grupolimalive.com:3967/live/tvelive.m3u8
 #EXTINF:-1 tvg-id="Canal50RTVE.bo",Canal 50 RTVE Punata (720p) [Not 24/7]
 https://vdo.grupolimalive.com:3241/live/encuentrotvlive.m3u8
@@ -47,9 +47,9 @@ https://tv.portalexpress.es:3044/live/dtplaylive.m3u8
 https://cloud2.streaminglivehd.com:1936/8182/8182/playlist.m3u8
 #EXTINF:-1 tvg-id="F10HD.bo",F10 HD (720p) [Not 24/7]
 https://video.live.com.bo:3099/live/f10hdlive.m3u8
-#EXTINF:-1 tvg-id="",FAP TV (480p)
+#EXTINF:-1 tvg-id="FAPTV.bo",FAP TV (480p)
 https://nd106.republicaservers.com/hls/c7284/index.m3u8
-#EXTINF:-1 tvg-id="",Fortaleza TV Cueto (720p)
+#EXTINF:-1 tvg-id="FortalezaTVCueto.bo",Fortaleza TV Cueto (720p)
 https://glb.bozztv.com/glb/ssh101/fortalezacueto/index.m3u8
 #EXTINF:-1 tvg-id="FTV.bo",FTV (720p)
 https://master.tucableip.com/ftv/index.m3u8
@@ -57,11 +57,11 @@ https://master.tucableip.com/ftv/index.m3u8
 https://master.tucableip.com/gigavision/playlist.m3u8
 #EXTINF:-1 tvg-id="",Gogo Play TV (720p)
 https://glb.bozztv.com/glb/ssh101/gogoplay/index.m3u8
-#EXTINF:-1 tvg-id="",Guadalupe TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="GTV.bo",Guadalupe TV (720p) [Not 24/7]
 https://solo.disfrutaenlared.com:1936/guadalupetv/guadalupetv/playlist.m3u8
 #EXTINF:-1 tvg-id="ImperialTV.bo",Imperial TV (720p) [Not 24/7]
 https://vdo.grupolimalive.com:3162/live/imperialtvlive.m3u8
-#EXTINF:-1 tvg-id="",IN TV (720p)
+#EXTINF:-1 tvg-id="INTV.bo",IN TV (720p)
 https://stmvideo3.livecastv.com/intv/intv/playlist.m3u8
 #EXTINF:-1 tvg-id="MarvisionTV.bo",Marvisión TV (720p)
 https://vdo.grupolimalive.com:3631/live/marvisionlive.m3u8
@@ -77,15 +77,15 @@ https://w8.redpat.tv:7777/play/120/index.m3u8
 https://w8.redpat.tv:7777/play/110/index.m3u8
 #EXTINF:-1 tvg-id="PTV.bo",PTV (720p)
 https://glb.bozztv.com/glb/ssh101/centralptv/index.m3u8
-#EXTINF:-1 tvg-id="",Radio Uno PST (720p)
+#EXTINF:-1 tvg-id="RadioUnoPST.bo",Radio Uno PST (720p)
 https://master.tucableip.com/pstbolivia/video.m3u8
 #EXTINF:-1 tvg-id="RedADvenirTV.bo",Red ADvenir TV (360p) [Not 24/7]
 http://streamer1.streamhost.org:1935/salive/GMIredadvenirm/playlist.m3u8
-#EXTINF:-1 tvg-id="",Red América TV (720p)
+#EXTINF:-1 tvg-id="RedAmericaTV.bo",Red América TV (720p)
 https://videostream.shockmedia.com.ar:19360/redamericatv/redamericatv.m3u8
 #EXTINF:-1 tvg-id="RedCCTV.bo",Red CCTV (480p)
 https://solo.disfrutaenlared.com:1936/redcctv/redcctv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Red DTV (1080p)
+#EXTINF:-1 tvg-id="RedDTV.bo",Red DTV (1080p)
 https://master.tucableip.com/dtvsc/playlist.m3u8
 #EXTINF:-1 tvg-id="RedUno.bo",Red Uno (1080p) [Not 24/7]
 https://streamer03.digital.com.bo/session/4e839498-b325-47f7-987f-205b4831346f/2ap337/__cl/cg:sworigin2/__c/REDUNO/__op/hls-default/__f/index.m3u8
@@ -107,15 +107,15 @@ https://seo.tv.bo/tv/SEOtv_5B.m3u8
 https://seo.tv.bo/tv/SEOTV6.m3u8
 #EXTINF:-1 tvg-id="SEOTV7.bo",SEO TV 7 (1080p)
 https://seo.tv.bo/tv/SEOTV7.m3u8
-#EXTINF:-1 tvg-id="",Siglo XXI TV (720p)
+#EXTINF:-1 tvg-id="SigloXXITV.bo",Siglo XXI TV (720p)
 https://stmvideo3.livecastv.com/sigloxxi/sigloxxi/playlist.m3u8
-#EXTINF:-1 tvg-id="",TDT Multimedia (720p)
+#EXTINF:-1 tvg-id="TDTMultimedia.bo",TDT Multimedia (720p)
 https://video01.kshost.com.br:4443/juan6318/juan6318/playlist.m3u8
 #EXTINF:-1 tvg-id="TLEstrella.bo",TL Estrella (720p) [Not 24/7]
 https://stmvideo3.livecastv.com/teleestrellahd/teleestrellahd/playlist.m3u8
-#EXTINF:-1 tvg-id="",Tu Tv (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TuTv.bo",Tu Tv (720p) [Not 24/7]
 https://solo.disfrutaenlared.com:1936/tutv/tutv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Tv Carigso (720p)
+#EXTINF:-1 tvg-id="TvCarigso.bo",Tv Carigso (720p)
 https://paneltv.tecnohost.ec:3646/live/carigsotvlive.m3u8
 #EXTINF:-1 tvg-id="TVHDTropical.bo",TV HD Tropical (720p)
 https://cloud2.streaminglivehd.com:19360/8060/8060.m3u8
@@ -131,24 +131,24 @@ https://cdn.digital.com.bo/__cl/cg:sworigin2/__c/UNITEL/__op/hls-default/__f/ind
 https://master.tucableip.com/univalletv/playlist.m3u8
 #EXTINF:-1 tvg-id="UPPTV.bo",UPP TV/Bolivisión SCZ (720p) [Not 24/7]
 https://alba-bo-bolivision-upptv.stream.mediatiquestream.com/index.m3u8
-#EXTINF:-1 tvg-id="",VTV Canal 17 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="VTVCanal17.bo",VTV Canal 17 (720p) [Not 24/7]
 https://solo.disfrutaenlared.com:1936/vtvcanal/vtvcanal/playlist.m3u8
 #EXTINF:-1 tvg-id="XTOTV.bo",XTOTV (1280p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://www.sccbolivia.com/
 http://190.104.15.135/0.ts
 #EXTINF:-1 tvg-id="XTOTV.bo",XTOTV (404p) [Not 24/7]
 http://www.channel.tevemi.com:1935/XtoTv/XtoTv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Zoy TV Music
+#EXTINF:-1 tvg-id="ZoyTVMusic.bo",Zoy TV Music
 https://giatv.bozztv.com/giatvplayout/giatv-208557/index.m3u8
-#EXTINF:-1 tvg-id="",Zoy TV Sports 1
-https://fl1004.bozztv.com/ssh101/zoytvsports/index.m3u8
-#EXTINF:-1 tvg-id="",Zoy TV Sports 2
-https://fl1004.bozztv.com/ssh101/zoytvsports2/index.m3u8
-#EXTINF:-1 tvg-id="",Zoy TV Sports 3
-https://fl1004.bozztv.com/ssh101/zoytvsports3/index.m3u8
-#EXTINF:-1 tvg-id="",Zoy TV Sports 4
-https://fl1004.bozztv.com/ssh101/zoytvsports4/index.m3u8
-#EXTINF:-1 tvg-id="",Zoy TV Sports 5
-https://fl1004.bozztv.com/ssh101/zoytvsports5/index.m3u8
-#EXTINF:-1 tvg-id="",Zoy TV Turcas
+#EXTINF:-1 tvg-id="ZoyTVTurcas.bo",Zoy TV Turcas
 https://fl1004.bozztv.com/ssh101/zoytvturcas/index.m3u8
+#EXTINF:-1 tvg-id="ZoyTVSports5.bo",Zoy TV Sports 5
+https://fl1004.bozztv.com/ssh101/zoytvsports5/index.m3u8
+#EXTINF:-1 tvg-id="ZoyTVSports4.bo",Zoy TV Sports 4
+https://fl1004.bozztv.com/ssh101/zoytvsports4/index.m3u8
+#EXTINF:-1 tvg-id="ZoyTVSports3.bo",Zoy TV Sports 3
+https://fl1004.bozztv.com/ssh101/zoytvsports3/index.m3u8
+#EXTINF:-1 tvg-id="ZoyTVSports2.bo",Zoy TV Sports 2
+https://fl1004.bozztv.com/ssh101/zoytvsports2/index.m3u8
+#EXTINF:-1 tvg-id="ZoyTVSports1.bo",Zoy TV Sports 1
+https://fl1004.bozztv.com/ssh101/zoytvsports/index.m3u8
diff --git a/streams/bq.m3u b/streams/bq.m3u
index 2baa16299..fca28c29e 100644
--- a/streams/bq.m3u
+++ b/streams/bq.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Bonaire.tv (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Bonairetv.bq",Bonaire.tv (1080p) [Not 24/7]
 https://media.streambrothers.com:1936/8506/8506/playlist.m3u8
 #EXTINF:-1 tvg-id="DutchCaribbeanTV.bq",Dutch Caribbean TV (720p) [Not 24/7]
 https://cur.watch/api/get_stream/dctv/basilachill/mystream.m3u8
 #EXTINF:-1 tvg-id="DutchCaribbeanTV.bq",Dutch Caribbean TV (720p) [Not 24/7]
 https://sincerecloud.stream/loadbalancer/public/actMdyoE.m3u8
-#EXTINF:-1 tvg-id="",Live99FM (1080p)
+#EXTINF:-1 tvg-id="Live99FM.bq",Live99FM (1080p)
 https://media.streambrothers.com:19360/8022/8022.m3u8
 #EXTINF:-1 tvg-id="NosTVBonaire.bq",Nos TV Bonaire (1080p)
 http://streaming.flamingotv.net/nostv/live.m3u8
diff --git a/streams/br.m3u b/streams/br.m3u
index 75a39a405..dd05ebc9c 100644
--- a/streams/br.m3u
+++ b/streams/br.m3u
@@ -109,7 +109,7 @@ http://www.portalcultura.com.br/playerhtml/funtelpa/tv_funtelpa/playlist.m3u8
 https://59d39900ebfb8.streamlock.net/cwbtv/cwbtv/playlist.m3u8
 #EXTINF:-1 tvg-id="DemaisTV.br",Demais TV (720p)
 https://stmv1.samcast.com.br/demaistv6503/demaistv6503/playlist.m3u8
-#EXTINF:-1 tvg-id="",DiaTV (1080p)
+#EXTINF:-1 tvg-id="DiaTV.br",DiaTV (1080p)
 https://ythls.armelin.one/channel/UCKnMcgDLxDeq9HqUgLhtYbQ.m3u8
 #EXTINF:-1 tvg-id="DunasTV.br",Dunas TV (720p)
 https://5cf4a2c2512a2.streamlock.net/dunastv/dunastv/playlist.m3u8
diff --git a/streams/ca.m3u b/streams/ca.m3u
index 5cca1ddbd..b33760be7 100644
--- a/streams/ca.m3u
+++ b/streams/ca.m3u
@@ -73,13 +73,13 @@ https://cbcrclinear-tor.akamaized.net/hls/live/2042768/CBCRCLINEAR_TOR_14/master
 https://cbcrclinear-tor.akamaized.net/hls/live/2042759/CBCRCLINEAR_TOR_5/master5.m3u8
 #EXTINF:-1 tvg-id="CHCOTV.ca",CHCO-TV (720p) [Geo-blocked]
 https://temp4.isilive.ca/live/CHCOTV/live/index.m3u8
-#EXTINF:-1 tvg-id="",CityNews Calgary (720p)
+#EXTINF:-1 tvg-id="CityNewsCalgary.ca",CityNews Calgary (720p)
 https://citynewsregional.akamaized.net/hls/live/1024053/Regional_Live_8/master.m3u8
 #EXTINF:-1 tvg-id="",CityNews Montreal (720p) [Not 24/7]
 https://dai.google.com/linear/hls/event/v6WfM9eaSjeioOsT6I2q3g/master.m3u8
-#EXTINF:-1 tvg-id="",CityNews Toronto (720p)
+#EXTINF:-1 tvg-id="CityNewsToronto.ca",CityNews Toronto (720p)
 https://citynewsregional.akamaized.net/hls/live/1024052/Regional_Live_7/master.m3u8
-#EXTINF:-1 tvg-id="",CityNews Vancouver (720p)
+#EXTINF:-1 tvg-id="CityNewsVancouver.ca",CityNews Vancouver (720p)
 https://citynewsregional.akamaized.net/hls/live/1024054/Regional_Live_9/master.m3u8
 #EXTINF:-1 tvg-id="",CNV/Montreal
 https://media1.radioservers.biz:1936/cnv/cnv/playlist.m3u8
@@ -113,15 +113,15 @@ https://hls.erfanhalgheh.live/hls/stream.m3u8
 https://cdn3.wowza.com/1/YW5wSWZiRGd2eFlU/bGV0aVBq/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="FightNetwork.ca",Fight Network (1080p)
 https://d12a2vxqkkh1bo.cloudfront.net/hls/main.m3u8
-#EXTINF:-1 tvg-id="",Gaunda Punjab TV
+#EXTINF:-1 tvg-id="GaundaPunjabTV.ca",Gaunda Punjab TV
 http://cdn6.live247stream.com/gaundapunjab/tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",GH Canada TV
+#EXTINF:-1 tvg-id="GHCanadaTV.ca",GH Canada TV
 https://stream.bozztv.com/tvstat-tamar/tvstat-tamar/playlist.m3u8
-#EXTINF:-1 tvg-id="",GTN Canada (1080p)
+#EXTINF:-1 tvg-id="GTNCanada.ca",GTN Canada (1080p)
 https://tvsw1-hls.secdn.net/tvsw1-chorigin/play/prod-1fddbb57573c4f80bcf79c807f720178/playlist.m3u8
 #EXTINF:-1 tvg-id="GurSikhSabhaTV.ca",GurSikh Sabha TV (720p) [Not 24/7]
 http://cdn12.henico.net:8080/live/gsctv/index.m3u8
-#EXTINF:-1 tvg-id="",Hyder TV
+#EXTINF:-1 tvg-id="HyderTV.ca",Hyder TV
 https://cdn.live247stream.com/hyder/tv/playlist.m3u8
 #EXTINF:-1 tvg-id="CFHDDT.ca",ICI Montreal (720p)
 https://amdici.akamaized.net/hls/live/873426/ICI-Live-Stream/master.m3u8
@@ -163,7 +163,7 @@ http://knstream1.azureedge.net/knlive/knlive_high.m3u8
 https://tvalive.akamaized.net/hls/live/2014213/tvan01/tvan01.m3u8
 #EXTINF:-1 tvg-id="LegislativeAssemblyofBritishColumbia.ca",Legislative Assembly of British Columbia
 https://cdn3.wowza.com/5/YldIU1hsTlljRWZF/hbs-prim-house-httpo/HouseP.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Legislative Assembly of British Columbia Committee A
+#EXTINF:-1 tvg-id="LegislativeAssemblyofBritishColumbiaCommitteeA.ca",Legislative Assembly of British Columbia Committee A
 https://cdn3.wowza.com/5/YldIU1hsTlljRWZF/hbs-prim-dougfir-httpo/DougFirP.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="LegislativeAssemblyofOntario.ca",Legislative Assembly of Ontario
 https://temp3.isilive.ca/live/_definst_/ontla/house-en/playlist.m3u8
@@ -177,7 +177,7 @@ https://lin13.isilive.ca/live/_definst_/ontla/committee_2-en/playlist.m3u8
 https://temp3.isilive.ca/live/_definst_/ontla/rm151-en/playlist.m3u8
 #EXTINF:-1 tvg-id="LegislativeAssemblyTVNunavut.ca",Legislative Assembly TV Nunavut
 http://temp2.isilive.ca/live/nunavut/live-eng/index.m3u8
-#EXTINF:-1 tvg-id="",Living Springs TV (1080p)
+#EXTINF:-1 tvg-id="LivingSpringsTV.ca",Living Springs TV (1080p)
 https://hls-cdn.tvstartup17.net/tvstartup17-channel/live/mp4:livingspringstvedge/playlist.m3u8
 #EXTINF:-1 tvg-id="LoveNature4K.ca",Love Nature 4K (2160p)
 https://d18dyiwu97wm6q.cloudfront.net/playlist.m3u8
@@ -230,7 +230,7 @@ http://primeasia.selfip.net/Samsung/index.m3u8
 http://cdn27.live247stream.com/primecanada/247/primecanada/stream1/playlist.m3u8
 #EXTINF:-1 tvg-id="QuoVadisTV.ca",Quo Vadis Ministry TV (720p)
 https://qvmstream.tulix.tv/720p/720p/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Tele Evangile Sans Limite
+#EXTINF:-1 tvg-id="RadioTeleEvangileSansLimite.ca",Radio Tele Evangile Sans Limite
 https://5790d294af2dc.streamlock.net/8124/8124/chunklist.m3u8
 #EXTINF:-1 tvg-id="SardariTV.ca",Sardari TV (1080p) [Not 24/7]
 http://158.69.124.9:1935/sardaritv/sardaritv/playlist.m3u8
diff --git a/streams/ca_pluto.m3u b/streams/ca_pluto.m3u
index 84892545a..5cea8d8cf 100644
--- a/streams/ca_pluto.m3u
+++ b/streams/ca_pluto.m3u
@@ -47,7 +47,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65b384020cb1a1000880dee9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799151-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=51514d9d-db13-4653-aa11-b64c6d4665cc
 #EXTINF:-1 tvg-id="",Catfish
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/64f8a2a23a0d700008a6ed7b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799152-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d33cda72-eef1-4ec7-8127-8301aff1d921
-#EXTINF:-1 tvg-id="",CBS News 24/7
+#EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6350fdd266e9ea0007bedec5/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799153-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=15376bcb-2b34-4530-a2f7-c528a8eb2aa3
 #EXTINF:-1 tvg-id="",Cheaters
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6582f7d612d5ee00089a663d/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c799154-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=b0c16eba-1daa-4dd1-9854-b271c81bb5e8
@@ -123,7 +123,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62fb62081afad500077e915e/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a2d97-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=8ea54251-dad6-45d5-9afb-2162c78ab93d
 #EXTINF:-1 tvg-id="",Forensic Files
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e92392a3e6270007f562e8/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a0-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=053b9371-9f0f-4936-9aa9-ae27ee69ae5f
-#EXTINF:-1 tvg-id="",Frasier
+#EXTINF:-1 tvg-id="Frasier.ca",Frasier
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62f4f90e39183b000769f12b/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a1-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=385f93fc-8e79-4ac3-9478-5758ce4a3181
 #EXTINF:-1 tvg-id="",Game Show Central
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62e90e8cb05d2b0007f10a61/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=2c7a54a2-35fc-11ef-a031-2b5d494037a2&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=06d7c73f-91e9-44c5-868e-5336253a1d67
diff --git a/streams/cd.m3u b/streams/cd.m3u
index fef58c942..7423ba030 100644
--- a/streams/cd.m3u
+++ b/streams/cd.m3u
@@ -1,19 +1,19 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",ACTU NGOLO TV HD (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ACTUNGOLOTVHD.cd",ACTU NGOLO TV HD (720p) [Not 24/7]
 https://helga.iptv2022.com/ACTU_NGOLO_TV_HD/index.m3u8
 #EXTINF:-1 tvg-id="AmenTVSat.cd",Amen TV Sat (1080p)
 https://tnt-television.com/amen_tv/index.m3u8
-#EXTINF:-1 tvg-id="",Balade Monde TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="BaladeMondeTV.cd",Balade Monde TV (720p) [Not 24/7]
 https://helga.iptv2022.com/BALADE_MODE_TV/index.m3u8
-#EXTINF:-1 tvg-id="",Biso TV (576p)
+#EXTINF:-1 tvg-id="BisoTV.cd",Biso TV (576p)
 https://tnt-television.com/BISO_TV/index.m3u8
 #EXTINF:-1 tvg-id="BossBrothersTV.cd",Boss Brothers TV (1080p)
 http://51.254.199.122:8080/bossbrothersTV/index.m3u8
-#EXTINF:-1 tvg-id="",CBC TV (720p)
+#EXTINF:-1 tvg-id="CBCTV.cd",CBC TV (720p)
 https://stream.berosat.live:19360/cbc-tv/cbc-tv.m3u8
 #EXTINF:-1 tvg-id="CCPVTelevision.cd",CCPV TV (1080p)
 https://tnt-television.com/CCPV-TV/index.m3u8
-#EXTINF:-1 tvg-id="",Compassion TV (240p)
+#EXTINF:-1 tvg-id="CompassionTV.cd",Compassion TV (240p)
 https://tnt-television.com/COMPASSION_FM/index.m3u8
 #EXTINF:-1 tvg-id="CongoPlanetTelevision.cd",Congo Planet Télévision (1080p) [Not 24/7]
 https://radio.congoplanet.com/Congo_Planet_TV.sdp/Congo_Planet_TV/playlist.m3u8
@@ -21,32 +21,32 @@ https://radio.congoplanet.com/Congo_Planet_TV.sdp/Congo_Planet_TV/playlist.m3u8
 https://radio.congoplanet.com/Congo_Planet_TV_Pop.sdp/Congo_Planet_TV_Pop/playlist.m3u8
 #EXTINF:-1 tvg-id="DigitalCongoTV.cd",Digital Congo TV (480p)
 https://tnt-television.com/DIGITAL_REGIE/index.m3u8
-#EXTINF:-1 tvg-id="",Eden City TV (720p)
+#EXTINF:-1 tvg-id="EdenCityTV.cd",Eden City TV (720p)
 https://tnt-television.com/EDEN_CITY_TV/index.m3u8
-#EXTINF:-1 tvg-id="",EGG PRO TV (720p)
+#EXTINF:-1 tvg-id="EGGPROTV.cd",EGG PRO TV (720p)
 https://helga.iptv2022.com/EGG_PRO_TV/index.m3u8
-#EXTINF:-1 tvg-id="",Espoir TV (240p)
+#EXTINF:-1 tvg-id="EspoirTV.cd",Espoir TV (240p)
 https://helga.iptv2022.com/sh/Espoir_TV/index.m3u8
 #EXTINF:-1 tvg-id="EVITV.cd",EVI TV (720p)
 https://stream.berosat.live:19360/evi-tv/evi-tv.m3u8
-#EXTINF:-1 tvg-id="",Face Tv (720p)
+#EXTINF:-1 tvg-id="FaceTv.cd",Face Tv (720p)
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_e691e400276e11ed9134c99c0b3a3c51
 https://stream.castr.com/630bd81fa9990f542884f80e/live_e691e400276e11ed9134c99c0b3a3c51/index.m3u8
 #EXTINF:-1 tvg-id="GeopolisTV.cd",Géopolis TV (240p)
 https://tnt-television.com/Geopolis_tv/index.m3u8
-#EXTINF:-1 tvg-id="",HK6 TV (1080p)
+#EXTINF:-1 tvg-id="HK6TV.cd",HK6 TV (1080p)
 https://tnt-television.com/HK6_TV/index.m3u8
-#EXTINF:-1 tvg-id="",Hope Channel TV (720p)
+#EXTINF:-1 tvg-id="HopeChannelTV.cd",Hope Channel TV (720p)
 https://glb.bozztv.com/glb/ssh101/hopetvg/playlist.m3u8
-#EXTINF:-1 tvg-id="",Kin Direct TV (320p)
+#EXTINF:-1 tvg-id="KinDirectTV.cd",Kin Direct TV (320p)
 https://helga.iptv2022.com/sh/Kin_Direct_Tv/index.m3u8
 #EXTINF:-1 tvg-id="",La Sentinelle TV (576p)
 https://tnt-television.com/LA_SENTINELLE/index.m3u8
-#EXTINF:-1 tvg-id="",LBFD RTV (1080p)
+#EXTINF:-1 tvg-id="LBFDRTV.cd",LBFD RTV (1080p)
 https://tnt-television.com/LBFD_RTV/index.m3u8
 #EXTINF:-1 tvg-id="MadiTV.cd",Madi TV (576p)
 https://tnt-television.com/MADI-TV/index.m3u8
-#EXTINF:-1 tvg-id="",Mandiko TV (614p) [Not 24/7]
+#EXTINF:-1 tvg-id="MandikoTV.cd",Mandiko TV (614p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_b072ea703a7111edbfe74bb80437147b
 https://stream.castr.com/632c52e09206c19bee72a6d6/live_b072ea703a7111edbfe74bb80437147b/index.m3u8
 #EXTINF:-1 tvg-id="MetanoiaTV.cd",Metanoia TV (720p)
@@ -59,9 +59,9 @@ https://tnt-television.com/MISHAPI-STREAM1/index.m3u8
 https://tnt-television.com/NUMERICA/index.m3u8
 #EXTINF:-1 tvg-id="NyotaTV.cd",Nyota TV (360p) [Not 24/7]
 http://51.254.199.122:8080/noyaTV/index.m3u8
-#EXTINF:-1 tvg-id="",ONE-TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ONETV.cd",ONE-TV (720p) [Not 24/7]
 https://core.live-apc.eu:5443/LiveApp/streams/backup.m3u8
-#EXTINF:-1 tvg-id="",Pourim RTV (360p)
+#EXTINF:-1 tvg-id="PourimRTV.cd",Pourim RTV (360p)
 https://cdn.mycloudstream.io/hls/live/broadcast/u67zmeky/index.m3u8
 #EXTINF:-1 tvg-id="PSTVHD.cd",PSTV HD (480p)
 https://tnt-television.com/PSTV_TVHD/index.m3u8
@@ -71,7 +71,7 @@ http://51.254.199.122:8080/PSTV/index.m3u8
 https://rlprotv.vedge.infomaniak.com/livecast/ik:rlprotv/manifest.m3u8
 #EXTINF:-1 tvg-id="RTNC.cd",RTNC (540p)
 https://tnt-television.com/rtnc_HD/index.m3u8
-#EXTINF:-1 tvg-id="",RUMBA TV (486p)
+#EXTINF:-1 tvg-id="RUMBATV.cd",RUMBA TV (486p)
 https://tnt-television.com/RUMBA-TV/index.m3u8
 #EXTINF:-1 tvg-id="SSMTV.cd",SSM TV (576p)
 https://tnt-television.com/SSM-STREAM1/index.m3u8
diff --git a/streams/cg.m3u b/streams/cg.m3u
index cf6354d12..ff1afb716 100644
--- a/streams/cg.m3u
+++ b/streams/cg.m3u
@@ -1,19 +1,19 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Beb TV (720p)
+#EXTINF:-1 tvg-id="BebTV.cg",Beb TV (720p)
 https://live-hls-qunv.livepush.io/live_cdn/em8A-kbzIfHqu73/index.m3u8
 #EXTINF:-1 tvg-id="DRTVInternational.cg",DRTV International (720p)
 http://51.254.199.122:8080/drtv/index.m3u8
-#EXTINF:-1 tvg-id="",Ev-télé (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Evtele.cg",Ev-télé (720p) [Not 24/7]
 https://tgn.bozztv.com/ssh101/ssh101/evtele/playlist.m3u8
 #EXTINF:-1 tvg-id="MabokeTV.cg",Maboke TV (720p)
 http://51.254.199.122:8080/mabokeTV/index.m3u8
 #EXTINF:-1 tvg-id="NazalisHDTV.cg",Nazali's HDTV (1080p)
 http://194.163.135.238:5080/WebRTCApp/streams/590264631485484547459082.m3u8
-#EXTINF:-1 tvg-id="",NTI TV (720p)
+#EXTINF:-1 tvg-id="NTITV.cg",NTI TV (720p)
 https://helga.iptv2022.com/NTI_Television/index.m3u8
 #EXTINF:-1 tvg-id="ObossoTV.cg",Obosso TV (1080p) [Not 24/7]
 https://obossobroadcast.fr/otv/obossotv/playlist.m3u8
-#EXTINF:-1 tvg-id="",SYNTY TV (720p)
+#EXTINF:-1 tvg-id="SYNTYTV.cg",SYNTY TV (720p)
 https://helga.iptv2022.com/sh/SYNTY_TV/index.m3u8
 #EXTINF:-1 tvg-id="TeleCongo.cg",Télé Congo (720p)
 http://51.254.199.122:8080/telecongo/index.m3u8
diff --git a/streams/ch.m3u b/streams/ch.m3u
index ac6ac219c..b297c7489 100644
--- a/streams/ch.m3u
+++ b/streams/ch.m3u
@@ -1,8 +1,8 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Alpen-Welle TV (720p)
-https://edge13.vedge.infomaniak.com/livecast/ik:alpen-wellelivestream/manifest.m3u8
 #EXTINF:-1 tvg-id="AlpenlandTV.ch",Alpenland TV (720p)
 https://edge14.vedge.infomaniak.com/livecast/ik:alpen-wellelivestream/playlist.m3u8
+#EXTINF:-1 tvg-id="AlpenWelleTV.ch",Alpen-Welle TV (720p)
+https://edge13.vedge.infomaniak.com/livecast/ik:alpen-wellelivestream/manifest.m3u8
 #EXTINF:-1 tvg-id="Canal9.ch",Canal 9 en Français (1080p)
 https://livehd.vedge.infomaniak.com/livecast/livehd/master.m3u8
 #EXTINF:-1 tvg-id="CanalAlphaJura.ch",Canal Alpha Jura (1080p)
@@ -29,7 +29,7 @@ https://bild-und-ton.stream/die-neue-zeit-tv-live/smil:dnz-de.smil/playlist.m3u8
 https://www.onairport.live/die-neue-zeit-tv-live/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="DritaTV.ch",Drita TV (1080p)
 https://protokolldns.xyz/dritaweb2023ds/index.m3u8
-#EXTINF:-1 tvg-id="",Immaculata TV (720p)
+#EXTINF:-1 tvg-id="ImmaculataTV.ch",Immaculata TV (720p)
 https://g5nl63z8lpq6-hls-live.5centscdn.com/tvistream/a5586d8ea3b7b021120a05c60dc59876.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Kanal9.ch",Kanal 9 auf Deutsch (1080p)
 https://edge21.vedge.infomaniak.com/livecast/ik:livesd2/manifest.m3u8
@@ -49,7 +49,7 @@ https://streaming.meteonews.net/hls/stream.m3u8
 https://h030.video-stream-hosting.de/quantisana-live/_definst_/smil:livestream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Radio3i.ch",Radio 3i (720p)
 https://vstream-cdn.ch/hls/radio3i.m3u8
-#EXTINF:-1 tvg-id="",Rhône TV (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="RhoneTV.ch",Rhône TV (1080p) [Geo-blocked]
 https://edge14.vedge.infomaniak.com/livecast/ik:rhonetv/manifest.m3u8
 #EXTINF:-1 tvg-id="RTVIslam.ch",RTV Islam (1080p)
 https://protokolldns.xyz/rtvislamweb554/index.m3u8
@@ -75,9 +75,9 @@ https://edge20.vedge.infomaniak.com/livecast/ik:telebielinguech/manifest.m3u8
 https://vstream-cdn.ch/hls/teleticino.m3u8
 #EXTINF:-1 tvg-id="TeleZuri.ch",TeleZüri (720p)
 https://klive.kaltura.com/env/cluster-1-d.live.nvp1/live/hls/p/1719221/e/1_se36k3uk/tl/main/st/0/t/d4y_3ZXUos_JzAX3LwBI3w/index-s32.m3u8
-#EXTINF:-1 tvg-id="TVRheintal.ch",TV Rheintal (720p)
-https://rtmp-vm.fidion.de/live/tvrt.m3u8
 #EXTINF:-1 tvg-id="TVM3.ch",TVM3 (1080p)
 https://livevideo.infomaniak.com/streaming/livecast/tvm3/playlist.m3u8
 #EXTINF:-1 tvg-id="TVO.ch",TVO (CH) (720p)
 https://cdnapisec.kaltura.com/p/1719221/sp/171922100/playManifest/entryId/1_t5h46v64/format/applehttp/protocol/https/a.m3u8
+#EXTINF:-1 tvg-id="TVRheintal.ch",TV Rheintal (720p)
+https://rtmp-vm.fidion.de/live/tvrt.m3u8
diff --git a/streams/ch_pluto.m3u b/streams/ch_pluto.m3u
index c30a047a7..1e12b20b3 100644
--- a/streams/ch_pluto.m3u
+++ b/streams/ch_pluto.m3u
@@ -53,7 +53,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5a4bb7da5c0007e5c9e9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=bc833035-4b91-11ef-8a44-83c5e90e038f&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=02dc7ae8-3204-4019-9535-f3d615e29651
 #EXTINF:-1 tvg-id="",Car Chase
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a93a9d3af63d00082c4850/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=bc833036-4b91-11ef-8a44-83c5e90e038f&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=3cce72fc-1904-4b18-b69d-0b16fda8d4dd
-#EXTINF:-1 tvg-id="",CBS News 24/7
+#EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62441d6ded1827000763dcda/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=bc833037-4b91-11ef-8a44-83c5e90e038f&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c76b19c9-a2e7-4ca7-bdfa-6632447d1e96
 #EXTINF:-1 tvg-id="",CC Made in Germany
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d4948418101147596fd6c5a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=bc835740-4b91-11ef-8a44-83c5e90e038f&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2745f95f-c6ce-48c4-a377-8d5fdc7a57f6
diff --git a/streams/ci.m3u b/streams/ci.m3u
index ea330faac..f90c8cd78 100644
--- a/streams/ci.m3u
+++ b/streams/ci.m3u
@@ -11,7 +11,7 @@ https://webstreaming.viewmedia.tv/web_021/Stream/playlist.m3u8
 https://voozmedia.fun/benietv/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="Business24Africa.ci",Business 24 Africa (480p)
 https://cdnamd-hls-globecast.akamaized.net/live/ramdisk/business24_tv/hls_video/index.m3u8
-#EXTINF:-1 tvg-id="",Champion TV (480p)
+#EXTINF:-1 tvg-id="ChampionTV.ci",Champion TV (480p)
 https://neriyastreaming.ddns.net/memfs/b92b5d69-7f44-4ae8-a00a-40d70623b1e6.m3u8
 #EXTINF:-1 tvg-id="ChristLive.ci",Christ Live (720p)
 https://voozmedia.fun/stream/christlive/playlist.m3u8
@@ -19,9 +19,9 @@ https://voozmedia.fun/stream/christlive/playlist.m3u8
 https://voozmedia.fun/divinamourtv/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="EcclesiaTV.ci",Ecclesia TV (720p)
 https://helga.iptv2022.com/sh/Ecclesia_TV/index.m3u8
-#EXTINF:-1 tvg-id="",Espérance TV (720p)
+#EXTINF:-1 tvg-id="EsperanceTV.ci",Espérance TV (720p)
 https://ik084235.ikoula.com/hls/Diff@mobile1.m3u8
-#EXTINF:-1 tvg-id="",Golden Sweet TV (720p)
+#EXTINF:-1 tvg-id="GoldenSweetTV.ci",Golden Sweet TV (720p)
 https://helga.iptv2022.com/sh/GOLDEN_SWEET_TV/index.m3u8
 #EXTINF:-1 tvg-id="GuideLoveTV.ci",Guide Love TV (720p)
 https://video1.getstreamhosting.com:1936/8056/8056/playlist.m3u8
diff --git a/streams/cl.m3u b/streams/cl.m3u
index 93ff3f46d..bc22d1675 100644
--- a/streams/cl.m3u
+++ b/streams/cl.m3u
@@ -91,7 +91,7 @@ https://v1.tustreaming.cl:19360/canalsurpatagoniatv/canalsurpatagoniatv.m3u8
 https://vdochile.com:3300/stream/play.m3u8
 #EXTINF:-1 tvg-id="CaracolaTV.cl",Caracola TV (Peñalolén) (720p) [Not 24/7]
 https://wifispeed.trapemn.tv:1936/comunales/caracola-tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Casa Sobre La Roca TV
+#EXTINF:-1 tvg-id="CasaSobreLaRocaTV.cl",Casa Sobre La Roca TV
 https://cp.panelchs.com:1936/8118/8118/playlist.m3u8
 #EXTINF:-1 tvg-id="Cauquenesnet.cl",Cauquenesnet (720p)
 https://vdo.miserver.pro:3102/stream/play.m3u8
diff --git a/streams/cn.m3u b/streams/cn.m3u
index 410388d5c..7d73e39bd 100644
--- a/streams/cn.m3u
+++ b/streams/cn.m3u
@@ -127,7 +127,7 @@ http://49.113.179.174:4022/udp/238.125.0.158:5140
 https://liveplus.lztv.tv/xwzh/HD/live.m3u8
 #EXTINF:-1 tvg-id="LaughterTheater.cn",Laughter Theater
 http://49.113.179.174:4022/udp/238.125.2.159:5140
-#EXTINF:-1 tvg-id="",Liangshan TV [Not 24/7]
+#EXTINF:-1 tvg-id="LiangshanTV.cn",Liangshan TV [Not 24/7]
 http://118.122.2.29:9999/hls/47/index.m3u8
 #EXTINF:-1 tvg-id="NeiMonggolTV.cn",Nei Monggol TV
 http://49.113.179.174:4022/udp/238.125.7.93:5140
@@ -147,8 +147,6 @@ http://video10.qtv.com.cn/drm/qtv6at/manifest.m3u8
 http://49.113.179.174:4022/udp/238.125.4.154:5140
 #EXTINF:-1 tvg-id="ShandongEducationTV.cn",Shandong Education TV
 http://49.113.179.174:4022/udp/238.125.0.156:5140
-#EXTINF:-1 tvg-id="ShanghaiEducationTelevisionStation.cn",Shanghai Education Television Station
-http://223.166.234.114:7777/tsfile/live/1033_1.m3u8
 #EXTINF:-1 tvg-id="SihaiFishingChannel.cn",Sihai Fishing Channel
 http://49.113.179.174:4022/udp/238.125.2.172:5140
 #EXTINF:-1 tvg-id="SMGFootballChannel.cn",SMG Football Channel
@@ -1519,3 +1517,5 @@ http://yslk.chinashadt.com:1635/live/stream:di1.stream/playlist.m3u8
 http://yslk.chinashadt.com:1635/live/stream:di2.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="",龙岩综合 (540p)
 http://stream.lytv.net.cn/2/sd/live.m3u8
+#EXTINF:-1 tvg-id="ShanghaiEducationTelevisionStation.cn",Shanghai Education Television Station
+http://223.166.234.114:7777/tsfile/live/1033_1.m3u8
diff --git a/streams/cn_cgtn.m3u b/streams/cn_cgtn.m3u
index d1d8ec180..f3c74cd26 100644
--- a/streams/cn_cgtn.m3u
+++ b/streams/cn_cgtn.m3u
@@ -1,29 +1,29 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="CGTN.cn",CGTN (1080p)
-https://english-livebkws.cgtn.com/live/encgtn.m3u8
 #EXTINF:-1 tvg-id="CGTN.cn",CGTN (576p)
 http://223.110.245.149/ott.js.chinamobile.com/PLTV/3/224/3221225917/index.m3u8
 #EXTINF:-1 tvg-id="CGTN.cn",CGTN (576p)
 https://news.cgtn.com/resource/live/english/cgtn-news.m3u8
-#EXTINF:-1 tvg-id="CGTNArabic.cn",CGTN Arabic (1080p) [Not 24/7]
-https://arabic-livews.cgtn.com/hls/LSveq57bErWLinBnxosqjisZ220802LSTefTAS9zc9mpU08y3np9TH220802cd/playlist.m3u8
+#EXTINF:-1 tvg-id="CGTN.cn",CGTN (1080p)
+https://english-livebkws.cgtn.com/live/encgtn.m3u8
 #EXTINF:-1 tvg-id="CGTNArabic.cn",CGTN Arabic (576p) [Not 24/7]
 https://news.cgtn.com/resource/live/arabic/cgtn-a.m3u8
-#EXTINF:-1 tvg-id="CGTNDocumentary.cn",CGTN Documentary (1080p) [Not 24/7]
-https://english-livebkali.cgtn.com/live/doccgtn.m3u8
+#EXTINF:-1 tvg-id="CGTNArabic.cn",CGTN Arabic (1080p) [Not 24/7]
+https://arabic-livews.cgtn.com/hls/LSveq57bErWLinBnxosqjisZ220802LSTefTAS9zc9mpU08y3np9TH220802cd/playlist.m3u8
 #EXTINF:-1 tvg-id="CGTNDocumentary.cn",CGTN Documentary (576p) [Not 24/7]
 https://news.cgtn.com/resource/live/document/cgtn-doc.m3u8
-#EXTINF:-1 tvg-id="CGTNSpanish.cn",CGTN Español (1080p)
-https://espanol-livews.cgtn.com/hls/LSveOGBaBw41Ea7ukkVAUdKQ220802LSTexu6xAuFH8VZNBLE1ZNEa220802cd/playlist.m3u8
+#EXTINF:-1 tvg-id="CGTNDocumentary.cn",CGTN Documentary (1080p) [Not 24/7]
+https://english-livebkali.cgtn.com/live/doccgtn.m3u8
 #EXTINF:-1 tvg-id="CGTNSpanish.cn",CGTN Español (576p)
 https://livees.cgtn.com/1000e/prog_index.m3u8
+#EXTINF:-1 tvg-id="CGTNSpanish.cn",CGTN Español (1080p)
+https://espanol-livews.cgtn.com/hls/LSveOGBaBw41Ea7ukkVAUdKQ220802LSTexu6xAuFH8VZNBLE1ZNEa220802cd/playlist.m3u8
 #EXTINF:-1 tvg-id="CGTNSpanish.cn",CGTN Español (576p) [Not 24/7]
 https://news.cgtn.com/resource/live/espanol/cgtn-e.m3u8
-#EXTINF:-1 tvg-id="CGTNFrench.cn",CGTN Français (1080p) [Not 24/7]
-https://francais-livews.cgtn.com/hls/LSvev95OuFZtKLc6CeKEFYXj220802LSTeV6PO0Ut9r71Uq3k5goCA220802cd/playlist.m3u8
 #EXTINF:-1 tvg-id="CGTNFrench.cn",CGTN Français (576p) [Not 24/7]
 https://news.cgtn.com/resource/live/french/cgtn-f.m3u8
-#EXTINF:-1 tvg-id="CGTNRussian.cn",CGTN Русский (1080p)
-https://russian-livews.cgtn.com/hls/LSvexABhNipibK5KRuUkvHZ7220802LSTeze9o8tdFXMHsb1VosgoT220802cd/playlist.m3u8
+#EXTINF:-1 tvg-id="CGTNFrench.cn",CGTN Français (1080p) [Not 24/7]
+https://francais-livews.cgtn.com/hls/LSvev95OuFZtKLc6CeKEFYXj220802LSTeV6PO0Ut9r71Uq3k5goCA220802cd/playlist.m3u8
 #EXTINF:-1 tvg-id="CGTNRussian.cn",CGTN Русский (576p)
 https://news.cgtn.com/resource/live/russian/cgtn-r.m3u8
+#EXTINF:-1 tvg-id="CGTNRussian.cn",CGTN Русский (1080p)
+https://russian-livews.cgtn.com/hls/LSvexABhNipibK5KRuUkvHZ7220802LSTeze9o8tdFXMHsb1VosgoT220802cd/playlist.m3u8
diff --git a/streams/co.m3u b/streams/co.m3u
index 67d851536..4cdefab20 100644
--- a/streams/co.m3u
+++ b/streams/co.m3u
@@ -3,7 +3,7 @@
 https://cp.panelchs.com:1936/8156/8156/playlist.m3u8
 #EXTINF:-1 tvg-id="Amordiscos.co",Amordiscos (540p) [Geo-blocked]
 https://canal.mediaserver.com.co/live/canalamordiscos.m3u8
-#EXTINF:-1 tvg-id="",ANC Televisión (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ANCTelevision.co",ANC Televisión (480p) [Not 24/7]
 https://canal.mediaserver.com.co/live/ANCTELEVISION.m3u8
 #EXTINF:-1 tvg-id="ATNTelevision.co",ATN Televisión (640p)
 https://59ef525c24caa.streamlock.net/atntelevision/atntelevision/playlist.m3u8
@@ -19,7 +19,7 @@ https://tvlatina.live:1936/8020/8020/playlist.m3u8
 https://movil.ejeserver.com/live/visiondorada.m3u8
 #EXTINF:-1 tvg-id="CanalVisionDorada.co",Bum Televisión (720p) [Not 24/7]
 https://video.ejeserver.com/live/visiondorada.m3u8
-#EXTINF:-1 tvg-id="",C4 Televisión (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="C4Television.co",C4 Televisión (720p) [Not 24/7]
 https://eu1.servers10.com:8081/8148/index.m3u8
 #EXTINF:-1 tvg-id="CableSurTV.co",Cable Sur TV (720p)
 https://tvlatina.live:1936/8012/8012/playlist.m3u8
@@ -31,53 +31,53 @@ https://5ab772334c39c.streamlock.net/live-calitv/calitv1/playlist.m3u8
 https://video17.virtualtronics.com/streamer/canalcampotv.m3u8
 #EXTINF:-1 tvg-id="Canal1.co",Canal 1 (1080p) [Geo-blocked]
 https://mdstrm.com/live-stream-playlist/5a5e1c2568b1910913db5fe2.m3u8
-#EXTINF:-1 tvg-id="",Canal 2 Alpavisión Ibagué (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal2AlpavisionIbague.co",Canal 2 Alpavisión Ibagué (720p) [Not 24/7]
 https://stmv4.voxtvhd.com.br/alpavisionibague/alpavisionibague/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 2 Alpavisión Neiva (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal2AlpavisionNeiva.co",Canal 2 Alpavisión Neiva (720p) [Not 24/7]
 https://stmv1.voxtvhd.com.br/alpavision/alpavision/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal2.co",Canal 2 Cali (720p)
 https://video13.virtualtronics.com/streamer/canal2.m3u8
-#EXTINF:-1 tvg-id="",Canal 8 Sincelejo (480p)
+#EXTINF:-1 tvg-id="Canal8Sincelejo.co",Canal 8 Sincelejo (480p)
 https://glb.bozztv.com/glb/ssh101/envivocanal8/index.m3u8
-#EXTINF:-1 tvg-id="",Canal 8 TV+ (720p)
+#EXTINF:-1 tvg-id="Canal8TVPlus.co",Canal 8 TV+ (720p)
 https://movil.ejeserver.com/live/canal8tv.m3u8
-#EXTINF:-1 tvg-id="",Canal 8 TV+ (720p)
+#EXTINF:-1 tvg-id="Canal8TVPlus.co",Canal 8 TV+ (720p)
 https://video.ejeserver.com/live/canal8tv.m3u8
 #EXTINF:-1 tvg-id="Canal9.co",Canal 9 Cosespu (720p)
 https://video2.lhdserver.es/canal9cosespu/live.m3u8
-#EXTINF:-1 tvg-id="",Canal 10 SOL TV (1080p)
+#EXTINF:-1 tvg-id="Canal10SOLTV.co",Canal 10 SOL TV (1080p)
 http://190.211.140.89:8081/SVTranscoder/SOLTVabr.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal14Codazzi.co",Canal 14 Codazzi (720p) [Not 24/7]
 https://eu1.servers10.com:8081/8056/index.m3u8
-#EXTINF:-1 tvg-id="",Canal 14 Regional (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal14Regional.co",Canal 14 Regional (720p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/videoenvivo/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 55 Telemorisco TV (720p)
+#EXTINF:-1 tvg-id="Canal55TelemoriscoTV.co",Canal 55 Telemorisco TV (720p)
 http://canal.mediaserver.com.co/live/telemorisco.m3u8
 #EXTINF:-1 tvg-id="CanalCapital.co",Canal Capital (1080p)
 https://cdns.livewave.co:8081/ccapitallive/index.m3u8
-#EXTINF:-1 tvg-id="",Canal Cine Dios (480p)
+#EXTINF:-1 tvg-id="CanalCineDios.co",Canal Cine Dios (480p)
 https://canal.mediaserver.com.co/live/cinedios.m3u8
 #EXTINF:-1 tvg-id="CanalDos.co",Canal Dos Yopal (720p)
 http://131.221.41.94/hls/canal2.m3u8
 #EXTINF:-1 tvg-id="CanalDos.co",Canal Dos Yopal (720p) [Not 24/7]
 https://canaldos.internetinalambrico.com.co:1936/live/canal2.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal INFO TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="CanalINFOTV.co",Canal INFO TV (1080p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/infotv01/playlist.m3u8
 #EXTINF:-1 tvg-id="CanalInstitucional.co",Canal Institucional (720p) [Not 24/7]
 https://streaming.rtvc.gov.co/TV_CanalInstitucional_live/smil:live.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal Más Televisión (720p)
+#EXTINF:-1 tvg-id="CanalMasTelevision.co",Canal Más Televisión (720p)
 https://movil.ejeserver.com/live/teledoradahd.m3u8
-#EXTINF:-1 tvg-id="",Canal Más Televisión (720p)
+#EXTINF:-1 tvg-id="CanalMasTelevision.co",Canal Más Televisión (720p)
 https://video.ejeserver.com/live/teledoradahd.m3u8
-#EXTINF:-1 tvg-id="",Canal Mundo Visión (720p)
+#EXTINF:-1 tvg-id="CanalMundoVision.co",Canal Mundo Visión (720p)
 https://movil.ejeserver.com/live/mundovisiontv.m3u8
-#EXTINF:-1 tvg-id="",Canal Mundo Visión (720p)
+#EXTINF:-1 tvg-id="CanalMundoVision.co",Canal Mundo Visión (720p)
 https://video.ejeserver.com/live/mundovisiontv.m3u8
 #EXTINF:-1 tvg-id="CanalNets.co",Canal Nets (720p) [Not 24/7]
 https://movil.ejeserver.com/live/nets.m3u8
 #EXTINF:-1 tvg-id="CanalNets.co",Canal Nets (720p) [Not 24/7]
 https://video.ejeserver.com/live/nets.m3u8
-#EXTINF:-1 tvg-id="",Canal Oración Con Son (1080p)
+#EXTINF:-1 tvg-id="CanalOracionConSon.co",Canal Oración Con Son (1080p)
 https://canal.mediaserver.com.co/live/oracionconson.m3u8
 #EXTINF:-1 tvg-id="CanalPyC.co",Canal PyC (480p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/pyctelevision/index.m3u8
@@ -101,7 +101,7 @@ https://mdstrm.com/live-stream-playlist/632391734be92a791e2750e6.m3u8
 https://mdstrm.com/live-stream-playlist/574463697b9817cf0886fc17.m3u8
 #EXTINF:-1 tvg-id="CarareTV.co",Carare TV (1080p) [Not 24/7]
 https://cp.panelchs.com:1936/8160/8160/playlist.m3u8
-#EXTINF:-1 tvg-id="",Champion TV (1080p)
+#EXTINF:-1 tvg-id="ChampionTV.co",Champion TV (1080p)
 https://canal.mediaserver.com.co/live/ChampionTv.m3u8
 #EXTINF:-1 tvg-id="CiudadelaTV.co",CiudadelaTV (614p) [Not 24/7]
 https://cp.panelchs.com:1936/8096/8096/playlist.m3u8
@@ -123,9 +123,9 @@ https://hvtraficonew.ddns.net/pastocnc3/cnc3/playlist.m3u8
 https://hvtraficonew.ddns.net/pastocnc2/cnc2/playlist.m3u8
 #EXTINF:-1 tvg-id="SonPopular.co",CNC Pasto Son Popular (720p) [Geo-blocked]
 https://hvtraficonew.ddns.net/pastocnc7/cnc7/playlist.m3u8
-#EXTINF:-1 tvg-id="",CNC Santander de Quilichao (480p)
+#EXTINF:-1 tvg-id="CNCSantanderdeQuilichao.co",CNC Santander de Quilichao (480p)
 https://movil.ejeserver.com/live/cncsantander.m3u8
-#EXTINF:-1 tvg-id="",CNC Santander de Quilichao (480p)
+#EXTINF:-1 tvg-id="CNCSantanderdeQuilichao.co",CNC Santander de Quilichao (480p)
 https://video.ejeserver.com/live/cncsantander.m3u8
 #EXTINF:-1 tvg-id="CNCTulua.co",CNC Tuluá (720p)
 https://servers.amelbasoluciones.co:19360/cnctulualive/cnctulualive.m3u8
@@ -138,15 +138,15 @@ https://liveingesta118.cdnmedia.tv/cristovisiontvlive/smil:rtmp01.smil/playlist.
 https://59a564764e2b6.streamlock.net/ctvbarranquilla/ctv/playlist.m3u8
 #EXTINF:-1 tvg-id="Eduvision.co",Eduvision (1080p)
 https://stmv3.voxtvhd.com.br/conex2/conex2/playlist.m3u8
-#EXTINF:-1 tvg-id="",En Casa TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="EnCasaTV.co",En Casa TV (1080p) [Not 24/7]
 https://cp.panelchs.com:1936/8112/8112/playlist.m3u8
-#EXTINF:-1 tvg-id="",Eureka (1080p)
+#EXTINF:-1 tvg-id="Eureka.co",Eureka (1080p)
 https://cdns.livewave.co:8081/eurekalive/index.m3u8
 #EXTINF:-1 tvg-id="FamiliChannel.co",Famili Channel (720p)
 https://cp.panelchs.com:1936/8012/8012/playlist.m3u8
-#EXTINF:-1 tvg-id="",Frecuencia F TV (1080p)
+#EXTINF:-1 tvg-id="FrecuenciaFTV.co",Frecuencia F TV (1080p)
 https://tv.frecuenciaf.com/live/envivo.m3u8
-#EXTINF:-1 tvg-id="",Full Música (720p)
+#EXTINF:-1 tvg-id="FullMusica.co",Full Música (720p)
 https://eu1.servers10.com:8081/8060/index.m3u8
 #EXTINF:-1 tvg-id="HuellasTV.co",Huellas.TV (1080p)
 https://cp.panelchs.com:1936/8170/8170/playlist.m3u8
@@ -154,21 +154,21 @@ https://cp.panelchs.com:1936/8170/8170/playlist.m3u8
 https://plataformavideo.com:19360/8020/8020.m3u8
 #EXTINF:-1 tvg-id="INPOTV.co",INPO TV (720p)
 https://cp.panelchs.com:1936/8108/8108/playlist.m3u8
-#EXTINF:-1 tvg-id="",La Cadena de la Bendición (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="LaCadenadelaBendicion.co",La Cadena de la Bendición (1080p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/cadenadelabend/index.m3u8
 #EXTINF:-1 tvg-id="LaDespechadaTV.co",La Despechada TV (720p)
 https://servidordevideo.com:3077/live/despechadalive.m3u8
-#EXTINF:-1 tvg-id="",La Hermandad Salsera (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="LaHermandadSalsera.co",La Hermandad Salsera (1080p) [Not 24/7]
 https://streamlov.alsolnet.com/hermandadsalsera/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",La Hermosa Stereo TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="LaHermosaStereoTV.co",La Hermosa Stereo TV (720p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/lhstv/index.m3u8
-#EXTINF:-1 tvg-id="",Luna Estéreo 106.4 FM (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="LunaEstereo1064FM.co",Luna Estéreo 106.4 FM (720p) [Not 24/7]
 https://servervideo.intermediacolombia.com:19360/kychbbfhdz/kychbbfhdz.m3u8
 #EXTINF:-1 tvg-id="MariquitaStereo.co",Mariquita Stereo (720p)
 https://tvlatina.live:1936/8016/8016/playlist.m3u8
-#EXTINF:-1 tvg-id="",MasMusica FM (720p)
+#EXTINF:-1 tvg-id="MasMusicaFM.co",MasMusica FM (720p)
 https://movil.ejeserver.com/live/masmusica.m3u8
-#EXTINF:-1 tvg-id="",MasMusica FM (720p)
+#EXTINF:-1 tvg-id="MasMusicaFM.co",MasMusica FM (720p)
 https://video.ejeserver.com/live/masmusica.m3u8
 #EXTINF:-1 tvg-id="MelodyChannel.co",Melody Channel Colombia (540p)
 https://canal.mediaserver.com.co/live/MelodyChannel.m3u8
@@ -186,9 +186,9 @@ https://cdns.livewave.co:8081/90minutoslive/index.m3u8
 https://cp.panelchs.com:1936/8162/8162/playlist.m3u8
 #EXTINF:-1 tvg-id="OasisTV.co",Oasis TV (720p) [Not 24/7]
 https://5e85d90130e77.streamlock.net/6020/6020/playlist.m3u8
-#EXTINF:-1 tvg-id="",Ondambiental TV (360p)
+#EXTINF:-1 tvg-id="OndambientalTV.co",Ondambiental TV (360p)
 https://stmv4.voxtvhd.com.br/ondastereo/ondastereo/playlist.m3u8
-#EXTINF:-1 tvg-id="",PS Televisión (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PSTelevision.co",PS Televisión (720p) [Not 24/7]
 https://xhateaec.com/livestreams/19.crKOSL8FRzpid0MA.m3u8
 #EXTINF:-1 tvg-id="PSCTelevision.co",PSC Televisión (720p) [Not 24/7]
 https://stmv4.voxtvhd.com.br/psctv/psctv/playlist.m3u8
@@ -200,11 +200,11 @@ https://cp.panelchs.com:1936/8010/8010/playlist.m3u8
 https://inforedvos.lcdn.claro.net.co/Content/HLS_HLS_DIR/Live/channel(REDMASHDWEB)/master.m3u8
 #EXTINF:-1 tvg-id="Reyali.co",Reyali (614p)
 https://eu1.servers10.com:8081/8090/index.m3u8
-#EXTINF:-1 tvg-id="",Salsa Gorda Television (720p)
+#EXTINF:-1 tvg-id="SalsaGordaTelevision.co",Salsa Gorda Television (720p)
 https://ssh101-fl.bozztv.com/ssh101/qMUAZEy/index.m3u8
 #EXTINF:-1 tvg-id="SantelTV.co",Santel TV (720p)
 https://tvlatina.live:1936/8004/8004/playlist.m3u8
-#EXTINF:-1 tvg-id="",Satel Canal 4 (1080p)
+#EXTINF:-1 tvg-id="SatelCanal4.co",Satel Canal 4 (1080p)
 https://server.asilivehd.com:3802/live/canal4live.m3u8
 #EXTINF:-1 tvg-id="SenalColombia.co",Señal Colombia (1080p)
 https://streaming.rtvc.gov.co/TV_Senal_Colombia_live/smil:live.smil/playlist.m3u8
@@ -245,11 +245,11 @@ https://cp.panelchs.com:1936/8094/8094/playlist.m3u8
 https://5ab772334c39c.streamlock.net/live-teleislas/teleislas/playlist.m3u8
 #EXTINF:-1 tvg-id="TelemusicaTV.co",Telemúsica TV (540p) [Geo-blocked]
 https://canal.mediaserver.com.co/live/telemusica.m3u8
-#EXTINF:-1 tvg-id="",Telenet Televisión (478p)
+#EXTINF:-1 tvg-id="TelenetTelevision.co",Telenet Televisión (478p)
 https://cp.panelchs.com:1936/8058/8058/playlist.m3u8
 #EXTINF:-1 tvg-id="Telepacifico.co",Telepacífico (1080p) [Not 24/7]
 https://stream.logicideas.media/telepacifico-live/smil:live.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Telepasto (360p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Telepasto.co",Telepasto (360p) [Geo-blocked]
 https://hvtraficonew.ddns.net/telepasto/telepasto.stream/index.m3u8
 #EXTINF:-1 tvg-id="Telesangil.co",Telesangil (720p) [Not 24/7] [Geo-blocked]
 https://hvtraficonew.ddns.net/tvsangil/tvsangil/index.m3u8
@@ -259,7 +259,7 @@ https://cp.panelchs.com:1936/8060/8060/playlist.m3u8
 https://stream.logicideas.media/canaltrece-live/smil:live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TrecePlus.co",Trece + (720p)
 https://stream.logicideas.media/canaltreceplus-live/smil:live1plus.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Tropical TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TropicalTV.co",Tropical TV (480p) [Not 24/7]
 https://rpn3.bozztv.com/ssh101/ssh101/estvco/playlist.m3u8
 #EXTINF:-1 tvg-id="TuKanal.co",Tu Kanal (1080p)
 http://45.33.63.98/hls/abdi.m3u8
@@ -269,11 +269,11 @@ https://envivo.tukanal.tv/hls/abdi.m3u8
 https://5bf8041cb3fed.streamlock.net/TUUNIVERSOTV/TUUNIVERSOTV/playlist.m3u8
 #EXTINF:-1 tvg-id="TVGracia.co",TV Gracia (720p)
 https://streamyes.alsolnet.com/tvgracia/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV Ipiales (1080p)
+#EXTINF:-1 tvg-id="TVIpiales.co",TV Ipiales (1080p)
 https://movil.ejeserver.com/live/tvipiales.m3u8
-#EXTINF:-1 tvg-id="",TV Ipiales (1080p)
+#EXTINF:-1 tvg-id="TVIpiales.co",TV Ipiales (1080p)
 https://video.ejeserver.com/live/tvipiales.m3u8
-#EXTINF:-1 tvg-id="",TV Mojana Canal 4 (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVMojanaCanal4.co",TV Mojana Canal 4 (480p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/tvmojanacanal4/index.m3u8
 #EXTINF:-1 tvg-id="TVPenol.co",TV Peñol (720p)
 https://stmv1.voxtvhd.com.br/tvpenol/tvpenol/playlist.m3u8
@@ -285,7 +285,7 @@ https://tvlatina.live:1936/8006/8006/playlist.m3u8
 https://movil.ejeserver.com/live/veotv.m3u8
 #EXTINF:-1 tvg-id="VeoTelevision.co",Veo Televisión (720p) [Not 24/7]
 https://video.ejeserver.com/live/veotv.m3u8
-#EXTINF:-1 tvg-id="",Vida Nueva TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="VidaNuevaTV.co",Vida Nueva TV (480p) [Not 24/7]
 https://eu1.servers10.com:8081/vidanuevatv/index.m3u8
 #EXTINF:-1 tvg-id="ViveTV.co",Vive TV Colombia (1080p)
 http://192.144.113.132:1935/live/ViveTV/playlist.m3u8
diff --git a/streams/cr.m3u b/streams/cr.m3u
index a50e537ed..aa178621d 100644
--- a/streams/cr.m3u
+++ b/streams/cr.m3u
@@ -21,7 +21,7 @@ https://alba-cr-repretel-c4.stream.mediatiquestream.com/index.m3u8
 https://alba-cr-repretel-c6.stream.mediatiquestream.com/index.m3u8
 #EXTINF:-1 tvg-id="Canal8.cr",Canal 8 (720p) [Not 24/7]
 https://mdstrm.com/live-stream-playlist/5a7b1e63a8da282c34d65445.m3u8
-#EXTINF:-1 tvg-id="",Canal 9 (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Canal9.cr",Canal 9 (720p) [Geo-blocked]
 http://201.201.149.86:8080/livestream/stream.m3u8
 #EXTINF:-1 tvg-id="Canal11.cr",Canal 11 (720p) [Geo-blocked]
 https://alba-cr-repretel-c11.stream.mediatiquestream.com/index.m3u8
@@ -29,7 +29,7 @@ https://alba-cr-repretel-c11.stream.mediatiquestream.com/index.m3u8
 http://tvn.obix.tv:1935/TVN/CH14.stream_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal17TVNosara.cr",Canal 17 TV Nosara
 https://acceso.radiosportstv.online:3430/hybrid/play.m3u8
-#EXTINF:-1 tvg-id="",Caribe TV CR (720p)
+#EXTINF:-1 tvg-id="CaribeTVCR.cr",Caribe TV CR (720p)
 https://rpn3.bozztv.com/ssh101/ssh101/sinart/playlist.m3u8
 #EXTINF:-1 tvg-id="CartagoMediosTV.cr",Cartago Medios TV (720p)
 https://tvdatta.com:3384/live/cartagomedioslive.m3u8
@@ -49,7 +49,7 @@ https://livecdn.enlace.plus/enlace/smil:enlace-hd.smil/playlist.m3u8
 https://11554-1.b.cdn13.com/EJTV/smil:ejtv-hd.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ExtremaTV.cr",Extrema TV (720p)
 https://627bb251f23c7.streamlock.net:444/ExtremaTV/ExtremaTV/playlist.m3u8
-#EXTINF:-1 tvg-id="",Faro Puntarenas TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="FaroPuntarenasTV.cr",Faro Puntarenas TV (720p) [Not 24/7]
 https://rpn3.bozztv.com/ssh101/ssh101/faroptv/playlist.m3u8
 #EXTINF:-1 tvg-id="FUTV.cr",FUTV Costa Rica (720p)
 #EXTVLCOPT:http-referrer=https://www.futvcr.com/
@@ -58,7 +58,7 @@ http://45.190.187.226:58092/play/a00q
 https://59ef525c24caa.streamlock.net/garabitoTV/garabitotv/playlist.m3u8
 #EXTINF:-1 tvg-id="GuatusoTV.cr",Guatuso TV (720p)
 https://5cf4a2c2512a2.streamlock.net/8162/8162/master.m3u8
-#EXTINF:-1 tvg-id="",HBTV TicaVisión (1080p)
+#EXTINF:-1 tvg-id="TicaVision.cr",HBTV TicaVisión (1080p)
 https://62fc643fbf1aa.streamlock.net/HBTV/HBTV/playlist.m3u8
 #EXTINF:-1 tvg-id="IQChannel.cr",IQ Channel (720p)
 https://rtmp.info/iqtv/envivo/playlist.m3u8
@@ -68,11 +68,11 @@ http://k4.usastreams.com/limontv1/limontv1/playlist.m3u8
 https://lstv.duckdns.org:449/hls/lstv.m3u8
 #EXTINF:-1 tvg-id="LuzNacienteTV.cr",Luz Naciente TV (720p)
 https://streeming.protoscr.com:3858/live/streeminglive.m3u8
-#EXTINF:-1 tvg-id="",Más Ciclismo TV (720p)
+#EXTINF:-1 tvg-id="MasCiclismoTV.cr",Más Ciclismo TV (720p)
 https://ssh101.bozztv.com/ssh101/masciclismo/playlist.m3u8
-#EXTINF:-1 tvg-id="",Más Ciclismo TV (720p)
+#EXTINF:-1 tvg-id="MasCiclismoTV.cr",Más Ciclismo TV (720p)
 https://vcp8.myplaytv.com:1936/masciclismo/masciclismo/playlist.m3u8
-#EXTINF:-1 tvg-id="",Meganet TV (720p)
+#EXTINF:-1 tvg-id="MeganetTV.cr",Meganet TV (720p)
 https://250weu.bozztv.com/ssh101/ssh101/meganettv/playlist.m3u8
 #EXTINF:-1 tvg-id="MetaVersusCR.cr",MetaVersus CR (480p)
 https://vivo.solumedia.com:19360/metaversus/metaversus.m3u8
@@ -86,15 +86,15 @@ https://videohd.live:19360/8076/8076.m3u8
 https://video01.logicahost.com.br/oldieshits/oldieshits/playlist.m3u8
 #EXTINF:-1 tvg-id="QuinceUCR.cr",Quince UCR (720p) [Not 24/7]
 http://163.178.170.127:1935/quinceucr/quinceucr/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Puerto TV (720p)
+#EXTINF:-1 tvg-id="RadioPuertoTV.cr",Radio Puerto TV (720p)
 https://cloudvideo.servers10.com:8081/8256/index.m3u8
 #EXTINF:-1 tvg-id="RetroTVPalmares.cr",Retro TV Palmarés (360p) [Not 24/7]
 https://250weu.bozztv.com/ssh101/ssh101/tvretropalmares/playlist.m3u8
-#EXTINF:-1 tvg-id="",Retrox TV (720p)
+#EXTINF:-1 tvg-id="RetroxTV.cr",Retrox TV (720p)
 https://rpn3.bozztv.com/ssh101/ssh101/retroxtvhd/playlist.m3u8
 #EXTINF:-1 tvg-id="RTTV.cr",RTTV (720p) [Not 24/7]
 https://cloudvideo.servers10.com:19360/8212/8212.m3u8
-#EXTINF:-1 tvg-id="",RTV Chirripó (720p)
+#EXTINF:-1 tvg-id="RTVChirripo.cr",RTV Chirripó (720p)
 https://lstv.duckdns.org:449/hls/rtchirripo.m3u8
 #EXTINF:-1 tvg-id="SanJoseTV.cr",San José TV (1080p)
 https://rtmp.info/sanjosetv/envivo/playlist.m3u8
@@ -127,11 +127,9 @@ https://s1.tvdatta.com:3582/live/telesurlive.m3u8
 https://cdn01.teletica.com/TeleticaLiveStream/Stream/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="TicaTVPlus.cr",Tica TV+ (288p)
 https://593b04c4c5670.streamlock.net/portalfoxmix/portalfoxmix/.m3u8
-#EXTINF:-1 tvg-id="TigoSports.cr",Tigo Sports (Costa Rica)
-https://acceso.radiosportstv.online:3795/stream/play.m3u8
-#EXTINF:-1 tvg-id="",Trece Costa Rica Televisión (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TreceCostaRicaTelevision.cr",Trece Costa Rica Televisión (720p) [Not 24/7]
 https://rpn3.bozztv.com/ssh101/ssh101/sinart13/playlist.m3u8
-#EXTINF:-1 tvg-id="" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36 CrKey/1.44.191160",Trivisión 36 (1080p)
+#EXTINF:-1 tvg-id="Trivision36.cr" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36 CrKey/1.44.191160",Trivisión 36 (1080p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36 CrKey/1.44.191160
 https://liveingesta118.cdnmedia.tv/trivision36live/smil:dvrlive.smil/playlist.m3u8?DVR=
 #EXTINF:-1 tvg-id="TVCurre.cr",TV Curré (720p) [Not 24/7]
@@ -144,7 +142,7 @@ http://tv.ticosmedia.com:1935/TVSUR/TVSUR/playlist.m3u8
 https://5bf8041cb3fed.streamlock.net/TVSURCANAL14/TVSURCANAL14/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPlus.cr",TV+ Canal 54 (480p)
 https://59ef525c24caa.streamlock.net/Tvpluscr/Tvpluscr/playlist.m3u8
-#EXTINF:-1 tvg-id="",Urbano TV (720p)
+#EXTINF:-1 tvg-id="UrbanoTV.cr",Urbano TV (720p)
 https://59ef525c24caa.streamlock.net/tvurbano/tvurbano/playlist.m3u8
 #EXTINF:-1 tvg-id="VideoTourChannel.cr",Video Tour Channel (480p) [Not 24/7]
 http://k4.usastreams.com/videotour/videotour/playlist.m3u8
@@ -156,7 +154,9 @@ https://59ef525c24caa.streamlock.net/vmtv/vmlatino/playlist.m3u8
 https://cloudvideo.servers10.com:8081/8198/index.m3u8
 #EXTINF:-1 tvg-id="XpressoJovenRadio.cr",Xpresso Joven Radio (720p)
 https://stmv.streamingvip.click/xpressojovenradiotv/xpressojovenradiotv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Zona Music TV (1080p)
+#EXTINF:-1 tvg-id="ZonaMusicTV.cr",Zona Music TV (1080p)
 https://acceso.radiosportstv.online:3022/stream/play.m3u8
 #EXTINF:-1 tvg-id="ZurquiTV.cr",Zurquí TV (720p)
 https://videoserver.tmcreativos.com:19360/gesfnvpamn/gesfnvpamn.m3u8
+#EXTINF:-1 tvg-id="TigoSports.cr",Tigo Sports (Costa Rica)
+https://acceso.radiosportstv.online:3795/stream/play.m3u8
diff --git a/streams/cv.m3u b/streams/cv.m3u
index 5d95d3a07..31792b0f9 100644
--- a/streams/cv.m3u
+++ b/streams/cv.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Radio TV Sal One (720p)
+#EXTINF:-1 tvg-id="RadioTVSalOne.cv",Radio TV Sal One (720p)
 https://lon.rtsp.me/r3ZnG6WN2HIRxPARhAirIQ/1713628621/hls/9QdykDAy.m3u8
 #EXTINF:-1 tvg-id="TCSMTV.cv",TCSM (1080p)
 https://blueeyecaboverde.com/cam1/memfs/e8e6696b-2102-45b9-9b5c-f9c101266d90.m3u8
-#EXTINF:-1 tvg-id="",TIVER (576p)
+#EXTINF:-1 tvg-id="TIVER.cv",TIVER (576p)
 https://cdn.live.br1.jmvstream.com/w/AVJ-13550/playlist/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV Cidade (614p)
+#EXTINF:-1 tvg-id="TVCidade.cv",TV Cidade (614p)
 https://stmv1.srvif.com/tvcidade/tvcidade/playlist.m3u8
diff --git a/streams/de.m3u b/streams/de.m3u
index 330005bcc..98365c45b 100644
--- a/streams/de.m3u
+++ b/streams/de.m3u
@@ -77,9 +77,9 @@ https://sdn-global-live-streaming-packager-cache.3qsdn.com/65181/65181_264_live.
 https://live2.telvi.de/hls/aktionaertv.m3u8
 #EXTINF:-1 tvg-id="DeutschesMusikFernsehen.de",Deutsches Musik Fernsehen (1080p) [Not 24/7]
 https://d-m-f.iptv-playoutcenter.de/dmf/dmf1/playlist.m3u8
-#EXTINF:-1 tvg-id="",DF1 (720p)
+#EXTINF:-1 tvg-id="DF1.de",DF1 (720p)
 https://dbjwcot8t7nyd.cloudfront.net/out/v1/9d068a9428444b458324ad77b5a0a4b8/index.m3u8
-#EXTINF:-1 tvg-id="",Dokusat (1080p)
+#EXTINF:-1 tvg-id="Dokusat.de",Dokusat (1080p)
 https://muc3.iptv-playoutcenter.de/dokusat/dokusat1/playlist.m3u8
 #EXTINF:-1 tvg-id="SachsenFernsehenDresden.de",Dresden Fernsehen (1080p) [Not 24/7]
 https://dresden.iptv-playoutcenter.de/dresden/dresdenfernsehen.stream_1/playlist.m3u8
@@ -169,7 +169,7 @@ https://mdrtvsnhls.akamaized.net/hls/live/2016928/mdrtvsn/index.m3u8
 https://mdrtvsahls.akamaized.net/hls/live/2016879/mdrtvsa/index.m3u8
 #EXTINF:-1 tvg-id="MDRFernsehenThuringen.de",MDR Fernsehen Thüringen (1080p) [Geo-blocked]
 https://mdrtvthhls.akamaized.net/hls/live/2016880/mdrtvth/index.m3u8
-#EXTINF:-1 tvg-id="",MeieTV (720p)
+#EXTINF:-1 tvg-id="MeieTV.de",MeieTV (720p)
 https://stream.meietv.de/live/meietv.m3u8
 #EXTINF:-1 tvg-id="MoreThanSportsTV.de",More Than Sports TV (1080p)
 https://mts1.iptv-playoutcenter.de/mts/mts-web/playlist.m3u8
diff --git a/streams/de_pluto.m3u b/streams/de_pluto.m3u
index 459481e81..a875d61c8 100644
--- a/streams/de_pluto.m3u
+++ b/streams/de_pluto.m3u
@@ -53,7 +53,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5e8b5a4bb7da5c0007e5c9e9/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b0-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=d9f332f4-cf88-4dfa-b110-d5810536c437
 #EXTINF:-1 tvg-id="",Car Chase
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65a93a9d3af63d00082c4850/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b1-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=2f1f40e7-a4ba-4408-8be1-f84ee6cf373e
-#EXTINF:-1 tvg-id="",CBS News 24/7
+#EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/62441d6ded1827000763dcda/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b2-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=dccc0e7c-5b78-4526-90f9-401f7ca29bc9
 #EXTINF:-1 tvg-id="CCMadeinGermany.de",CC Made in Germany
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d4948418101147596fd6c5a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=84aca4b3-4b92-11ef-aece-533610f1ea34&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cebc08f6-619a-468b-ba8e-e6971225e6c6
diff --git a/streams/dk_samsung.m3u b/streams/dk_samsung.m3u
index d6831bdad..ab0eb74bd 100644
--- a/streams/dk_samsung.m3u
+++ b/streams/dk_samsung.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",AfricaNews English (720p)
+#EXTINF:-1 tvg-id="AfricanewsEnglish.fr",AfricaNews English (720p)
 https://rakuten-africanews-1-dk.samsung.wurl.tv/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergTV.us",Bloomberg TV US (1080p)
 https://bloomberg-bloomberg-1-dk.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/do.m3u b/streams/do.m3u
index ad90dce52..8d9416a3a 100644
--- a/streams/do.m3u
+++ b/streams/do.m3u
@@ -7,7 +7,7 @@ https://glb.bozztv.com/glb/ssh101/0038/index.m3u8
 https://cm.hostlagarto.com:4445/phtv/Phtv.myStream/chunks.m3u8
 #EXTINF:-1 tvg-id="Agenda56TV.do",Agenda 56 (720p)
 https://cloudflare.streamgato.us:3148/live/agenda56tvlive.m3u8
-#EXTINF:-1 tvg-id="",Ahora TV (720p)
+#EXTINF:-1 tvg-id="AhoraTV.do",Ahora TV (720p)
 https://tv.livestreaminggroup.info:3513/live/canal35live.m3u8
 #EXTINF:-1 tvg-id="AIONTV.do",AION TV (1080p)
 https://vdo.aiontelevision.com:3735/live/aiontelevisionlive.m3u8
@@ -15,7 +15,7 @@ https://vdo.aiontelevision.com:3735/live/aiontelevisionlive.m3u8
 https://5790d294af2dc.streamlock.net/alcarrizostv/alcarrizostv/playlist.m3u8
 #EXTINF:-1 tvg-id="AlegreTVRD.do",Alegre TV (720p)
 https://vsrv2.az-streamingserver.com:3149/live/alegretvlive.m3u8
-#EXTINF:-1 tvg-id="",Altanto TV (720p)
+#EXTINF:-1 tvg-id="AltantoTV.do",Altanto TV (720p)
 https://streaming.altantotv.domiplay.net/hls/0/stream.m3u8
 #EXTINF:-1 tvg-id="Ame47.do",Amé 47 (720p)
 https://ss9.domint.net:3040/ame_str/amecanal47/playlist.m3u8
@@ -37,7 +37,7 @@ https://inliveserver.com:1936/11548/11548/playlist.m3u8
 https://ss5.domint.net:3034/astv_str/asmartv/playlist.m3u8
 #EXTINF:-1 tvg-id="BajoTechoTV.do",Bajo Techo TV (1080p) [Not 24/7]
 https://rdn.essastream.com:3042/live/bajotechotvlive.m3u8
-#EXTINF:-1 tvg-id="",Bebeto TV (1080p)
+#EXTINF:-1 tvg-id="BebetoTV.do",Bebeto TV (1080p)
 https://ss5.domint.net:3170/cotv_str/colometv/playlist.m3u8
 #EXTINF:-1 tvg-id="Bellavision.do",Bellavisión (1080p)
 https://rdn.essastream.com:3110/live/bellavision8hdlive.m3u8
@@ -69,7 +69,7 @@ http://newyorkstream.ddns.net:5854/enlacecanalamerica/encoderRD/playlist.m3u8
 https://tv.livestreaminggroup.info:3052/live/catorcetvlive.m3u8
 #EXTINF:-1 tvg-id="CanalDTV.do",Canal DTV (720p)
 https://s.emisoras.tv:8081/dtv/index.m3u8
-#EXTINF:-1 tvg-id="",Canal Multivision (720p)
+#EXTINF:-1 tvg-id="CanalMultivision.do",Canal Multivision (720p)
 https://fl1002.bozztv.com/ssh101/canalmulti24/index.m3u8
 #EXTINF:-1 tvg-id="CanaldelSol.do",Canal Sol (720p)
 https://5790d294af2dc.streamlock.net/sol65/sol65/playlist.m3u8
@@ -109,7 +109,7 @@ https://streamunoapp.com:3057/live/clarovisiontvlive.m3u8
 https://cloudflare.streamgato.us:3253/live/canalcocotvlive.m3u8
 #EXTINF:-1 tvg-id="",Codigo TV
 https://vdo2.streamgato.us:3313/live/codigotvlive.m3u8
-#EXTINF:-1 tvg-id="",ColimdoT TV (720p)
+#EXTINF:-1 tvg-id="ColimdoTV.do",ColimdoT TV (720p)
 https://cnn.livestreaminggroup.info:3132/live/colimdotvlive.m3u8
 #EXTINF:-1 tvg-id="ColorVision.do",Color Visión (720p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/0009/index.m3u8
@@ -129,7 +129,7 @@ https://cnn.essastream.com:3333/live/cromtvlive.m3u8
 https://vdo2.streamgato.us:3978/live/ctvlive.m3u8
 #EXTINF:-1 tvg-id="DANTV.do",DAN TV (720p) [Not 24/7]
 https://vdo2.streamgato.us:3562/live/dantvlive.m3u8
-#EXTINF:-1 tvg-id="",De Ultimo Minuto TV
+#EXTINF:-1 tvg-id="DeUltimoMinutoTV.do",De Ultimo Minuto TV
 https://soportedvb.click:3620/live/deultimominutomedialive.m3u8
 #EXTINF:-1 tvg-id="",Delta TV
 https://rdn.essastream.com:3949/live/deltatv50live.m3u8
@@ -147,9 +147,9 @@ https://streaming.grupomediosdelnorte.com:19360/ecovision/ecovision.m3u8
 https://vdopanel.jlahozconsulting.com:3720/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="El75TV.do",El 75 (720p)
 https://television.essastream.com:3502/live/bebetotelevisionlive.m3u8
-#EXTINF:-1 tvg-id="",El Nuevo Diario TV (480p)
+#EXTINF:-1 tvg-id="ElNuevoDiarioTV.do",El Nuevo Diario TV (480p)
 https://glb.bozztv.com/glb/ssh101/0048/index.m3u8
-#EXTINF:-1 tvg-id="",El PuertoTV (720p)
+#EXTINF:-1 tvg-id="ElPuertoTV.do",El PuertoTV (720p)
 https://5bf8041cb3fed.streamlock.net/PuertoTV/PuertoTV/playlist.m3u8
 #EXTINF:-1 tvg-id="Enntivision.do",Enntivisión (720p)
 https://rdn.essastream.com:3356/live/enntivisiontvlive.m3u8
@@ -165,19 +165,19 @@ https://streamtv.intervenhosting.net:3754/hybrid/play.m3u8
 https://cdn9.streamgato.us:3602/live/fratatvlive.m3u8
 #EXTINF:-1 tvg-id="FuegoTV.do",Fuego TV (720p) [Not 24/7]
 https://video.misistemareseller.com/Fuegotv/Fuegotv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Galaxia TV (360p)
+#EXTINF:-1 tvg-id="GalaxiATeVe.do",Galaxia TV (360p)
 https://streaming.grupomediosdelnorte.com:19360/galaxiateve/galaxiateve.m3u8
 #EXTINF:-1 tvg-id="GDMTV.do",GDMTV (720p) [Not 24/7]
 https://ss2.domint.net:3200/gdm_str/gdmtv/playlist.m3u8
-#EXTINF:-1 tvg-id="",GET TV (720p)
+#EXTINF:-1 tvg-id="GETtv.do",GET TV (720p)
 https://cnn.livestreaminggroup.info:3050/live/gettvlive.m3u8
 #EXTINF:-1 tvg-id="GHTelevision.do",GH Television (1080p)
 https://tv.ghtelevision.com:3018/live/ghtelevisionlive.m3u8
-#EXTINF:-1 tvg-id="",Gi Television (720p)
+#EXTINF:-1 tvg-id="GiTelevision.do",Gi Television (720p)
 https://ssh101.bozztv.com/ssh101/rctvhd103/chunks.m3u8
 #EXTINF:-1 tvg-id="",Global Social TV (720p)
 https://ss9.domint.net:3042/gstv_str/globalsocialtv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Global TV (720p)
+#EXTINF:-1 tvg-id="GlobalTV.do",Global TV (720p)
 https://ss3.domint.net:3136/gtv_str/globalhd/playlist.m3u8
 #EXTINF:-1 tvg-id="GuacaraTV.do",Guacara TV (720p)
 https://imagenuniversaltv.net:3820/live/guacaratvlive.m3u8
@@ -253,7 +253,7 @@ https://paz.sytes.net:5443/live/streams/misioneltv.m3u8
 https://video.udwn.net:19360/miturnotv/miturnotv.m3u8
 #EXTINF:-1 tvg-id="MiTV.do",MiTV (720p) [Not 24/7]
 https://ss2.domint.net:3204/mitv_str/mitv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Moca Vision Canal 48 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MocaVisionCanal48.do",Moca Vision Canal 48 (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_980a76901c6211ef8b04b736160277af
 https://stream.castr.com/5da89a909db964293ad13301/live_980a76901c6211ef8b04b736160277af/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="",Montecristi Digital TV
@@ -272,7 +272,7 @@ https://cdn3.streamgato.us:3938/live/nexxotvlive.m3u8
 https://ssh101-fl.bozztv.com/ssh101/nisibontv/playlist.m3u8
 #EXTINF:-1 tvg-id="NitidaTV.do",Nitida TV
 https://ed18ov.live.opencaster.com/bznudxxdtppv/index.m3u8
-#EXTINF:-1 tvg-id="",Noticias 16
+#EXTINF:-1 tvg-id="Noticias16.do",Noticias 16
 https://cdn.essastream.com:3457/live/noticiasn16live.m3u8
 #EXTINF:-1 tvg-id="",Notisur TV
 https://ss9.domint.net:3006/nsb_str/notisur/playlist.m3u8
@@ -334,7 +334,7 @@ https://vsrv2.az-streamingserver.com:3331/live/rocavisiontvlive.m3u8
 https://videoserver.tmcreativos.com:19360/cvmhbyrcat/cvmhbyrcat.m3u8
 #EXTINF:-1 tvg-id="Rumba985FM.do",Rumba 98.5 FM (720p)
 https://ss5.domint.net:3038/rum_str/rumba985fm/playlist.m3u8
-#EXTINF:-1 tvg-id="",Ruta66 TV (720p)
+#EXTINF:-1 tvg-id="Ruta66TV.do",Ruta66 TV (720p)
 https://cnn.livestreaminggroup.info:3796/live/ruta66tvlive.m3u8
 #EXTINF:-1 tvg-id="SanIsidroTV.do",San Isidro TV (720p) [Not 24/7]
 https://rdn.essastream.com:3160/live/sanisidrotvlive.m3u8
@@ -344,7 +344,7 @@ https://vdo1.streamgato.us:3677/live/telemileniolive.m3u8
 https://ss5.domint.net:3002/stv_str/sensaciontv/playlist.m3u8
 #EXTINF:-1 tvg-id="",Siembra TV (720p)
 https://streamunoapp.com:3809/live/siembratvlive.m3u8
-#EXTINF:-1 tvg-id="",Sima Vision TV (720p)
+#EXTINF:-1 tvg-id="SimavisionCanal18.do",Sima Vision TV (720p)
 https://soportedvb.click:3668/live/simavisiontvlive.m3u8
 #EXTINF:-1 tvg-id="SiTV.do",SiTV (720p)
 https://glb.bozztv.com/glb/ssh101/0045/index.m3u8
@@ -439,7 +439,7 @@ https://soportedvb.click:3608/live/tierravisionlive.m3u8
 https://ss9.domint.net:3012/ttv_str/+tigueritotv/playlist.m3u8
 #EXTINF:-1 tvg-id="",Tinmarin TV (720p)
 https://tv.tinmarintv.com:3986/live/tinmarintvlive.m3u8
-#EXTINF:-1 tvg-id="",TNE Canal 58 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TNECanal58.do",TNE Canal 58 (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_786ad79075d011efa3790bffd883d562
 https://stream.castr.com/5da89a909db964293ad13301/live_786ad79075d011efa3790bffd883d562/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="TNICanal51.do",TNI Canal51 (720p) [Not 24/7]
@@ -452,9 +452,9 @@ https://fl1002.bozztv.com/ssh101/0165/index.m3u8
 https://cloudflare.streamgato.us:3125/live/megacinetvlive.m3u8
 #EXTINF:-1 tvg-id="TV10SanJuan.do",TV 10 San Juan (720p)
 https://59d39900ebfb8.streamlock.net/TV10SanJuan/TV10SanJuan/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV43 (720p)
+#EXTINF:-1 tvg-id="TV43.do",TV43 (720p)
 https://ss5.domint.net:3058/tv43_str/tv43/chunklist_w594470939.m3u8
-#EXTINF:-1 tvg-id="",TV Canal Sur (720p)
+#EXTINF:-1 tvg-id="TVCanalSur.do",TV Canal Sur (720p)
 https://ss9.domint.net:3030/sur_str/surtv/playlist.m3u8
 #EXTINF:-1 tvg-id="TVDaja.do",TV Daja (1080p)
 https://rdn.essastream.com:3388/live/dajatvlive.m3u8
@@ -466,7 +466,7 @@ https://vdo1.streamgato.us:3046/live/tvhigueycanal12live.m3u8
 https://host.streamingnation.live/p/3780/live/tvluzlive.m3u8
 #EXTINF:-1 tvg-id="TVMontanaCanal10.do",TV Montaña Canal 10 (1080p)
 https://ss5.domint.net:3064/tvm_str/montanatv/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV N24 (720p)
+#EXTINF:-1 tvg-id="TVN24.do",TV N24 (720p)
 https://ss5.domint.net:3032/vozz_str/vozzmedia/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPlata.do",TV Plata (720p)
 https://ss9.domint.net:3032/tvp_str/tvp2111/playlist.m3u8
@@ -490,13 +490,13 @@ https://streaming.telecablecentral.com.do/Vallevision/ValleHD/playlist.m3u8
 https://kali.vdopanel.com:3396/live/arseniolive.m3u8
 #EXTINF:-1 tvg-id="VegavisionCanal18.do",Vegavisión Canal 18 (720p)
 https://rdn.essastream.com:3400/live/canal18hdlive.m3u8
-#EXTINF:-1 tvg-id="",VillaAltagracia TV
+#EXTINF:-1 tvg-id="VillaAltagraciaTV.do",VillaAltagracia TV
 https://inliveserver.com:1936/10016/10016/playlist.m3u8
 #EXTINF:-1 tvg-id="Vision3000.do",Vision 3000 TV
 https://ss3.domint.net:3102/v3_str/v3000/playlist.m3u8
 #EXTINF:-1 tvg-id="",Vision Global TV (720p)
 https://ss5.domint.net:3012/vgtv_str/visionglobaltv/playlist.m3u8
-#EXTINF:-1 tvg-id="",VisionNDV TV
+#EXTINF:-1 tvg-id="VisionNDV.do",VisionNDV TV
 https://cloudflare.streamgato.us:3820/live/visionndvlive.m3u8
 #EXTINF:-1 tvg-id="VTVCanal32.do",VTV Canal 32 (1080p)
 https://cnn.livestreaminggroup.info:3507/live/vtv32live.m3u8
diff --git a/streams/dz.m3u b/streams/dz.m3u
index 5078cb42b..331b59f2e 100644
--- a/streams/dz.m3u
+++ b/streams/dz.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="TV2.dz",Algérie TV2 (480p)
 https://bozztv.com/inim03/live1/giniko_canalalgerie/chunks.m3u8
-#EXTINF:-1 tvg-id="",Amou Yazid TV (1080p)
+#EXTINF:-1 tvg-id="AmouYazidTV.dz",Amou Yazid TV (1080p)
 http://numide.servemp3.com:8089/hls/ay1.m3u8
 #EXTINF:-1 tvg-id="CNA.dz",CNA (Chaîne Nord Africaine) (360p) [Not 24/7]
 https://live.creacast.com/cna/smil:cna.smil/playlist.m3u8
@@ -17,7 +17,7 @@ https://echorouk-live-tv.dzsecurity.net/fullres/EchoroukTV_First/playlist.m3u8
 https://raw.githubusercontent.com/ipstreet312/freeiptv/master/ressources/dzflix/echorouktv.m3u8
 #EXTINF:-1 tvg-id="ElBilad.dz",El Bilad (576p) [Not 24/7]
 https://raw.githubusercontent.com/ipstreet312/freeiptv/master/ressources/dzflix/elbilad.m3u8
-#EXTINF:-1 tvg-id="",Elwatania TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ElwataniaTV.dz",Elwatania TV (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_1b36cfb0ba2411ee9700956e0f7084c8
 https://stream.castr.com/62c18c3f14d09a0b7e5355a5/live_1b36cfb0ba2411ee9700956e0f7084c8/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="EnnaharTV.dz",Ennahar TV (576p) [Not 24/7] [Geo-blocked]
diff --git a/streams/ec.m3u b/streams/ec.m3u
index 5a068a61e..adc41aed0 100644
--- a/streams/ec.m3u
+++ b/streams/ec.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",América Estéreo Guayaquil (360p)
+#EXTINF:-1 tvg-id="AmericaEstereoGuayaquil.ec",América Estéreo Guayaquil (360p)
 https://video.makrodigital.com/americaestereoguayaquil/americaestereoguayaquil/playlist.m3u8
-#EXTINF:-1 tvg-id="",América Estéreo Ibarra (720p)
+#EXTINF:-1 tvg-id="AmericaEstereoIbarra.ec",América Estéreo Ibarra (720p)
 https://video.makrodigital.com/americaestereoibarra/americaestereoibarra/playlist.m3u8
-#EXTINF:-1 tvg-id="",América Estéreo Quito (1080p)
+#EXTINF:-1 tvg-id="AmericaEstereoQuito.ec",América Estéreo Quito (1080p)
 https://video.makrodigital.com/americaestereoquito/americaestereoquito/playlist.m3u8
-#EXTINF:-1 tvg-id="",América Estéreo Tulcán (614p)
+#EXTINF:-1 tvg-id="AmericaEstereoTulcan.ec",América Estéreo Tulcán (614p)
 https://video.makrodigital.com/americaestereotulcan/americaestereotulcan/playlist.m3u8
 #EXTINF:-1 tvg-id="AntenaUnoRadiovideo.ec",Antena Uno RadioVideo (360p)
 https://tvdatta.com:3578/live/antenaunolive.m3u8
@@ -15,23 +15,23 @@ https://asomatv.duckdns.org/livestream/stream.m3u8
 https://stmv3.voxtvhd.com.br/australtv/australtv/playlist.m3u8
 #EXTINF:-1 tvg-id="CanalUno.ec",Canal Uno (720p)
 https://cp.panelchs.com:1936/8034/8034/playlist.m3u8
-#EXTINF:-1 tvg-id="",Capricho TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CaprichoTV.ec",Capricho TV (720p) [Not 24/7]
 https://video.compuwebecuador.com:3783/live/caprichotvlive.m3u8
-#EXTINF:-1 tvg-id="",Ciracu TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CiracuTV.ec",Ciracu TV (720p) [Not 24/7]
 https://cloud37.ecuatel.com/ciracutv/live/manifest.m3u8
-#EXTINF:-1 tvg-id="",Curiquingue TV (720p)
+#EXTINF:-1 tvg-id="CuriquingueTV.ec",Curiquingue TV (720p)
 https://video2.lhdserver.es/pjtv/live.m3u8
-#EXTINF:-1 tvg-id="",Duende Tv (720p)
+#EXTINF:-1 tvg-id="DuendeTv.ec",Duende Tv (720p)
 https://ed29ov.live.opencaster.com/EDokztdeHFwk/index.m3u8
 #EXTINF:-1 tvg-id="DuranTV.ec",Durán TV (480p) [Not 24/7]
 https://cloudvideo.servers10.com:8081/8074/index.m3u8
 #EXTINF:-1 tvg-id="EcotelTV.ec",Ecotel (720p) [Not 24/7]
 https://ecotel.streamseguro.com/hls/ecoteltv.m3u8
-#EXTINF:-1 tvg-id="",Ecua Stereo Radio TV (1080p)
+#EXTINF:-1 tvg-id="EcuaStereoRadioTV.ec",Ecua Stereo Radio TV (1080p)
 https://video.misistemareseller.com/ecuastereotv/ecuastereotv/playlist.m3u8
 #EXTINF:-1 tvg-id="EcuadorTV.ec",Ecuador TV (720p)
 https://samson.streamerr.co:8081/shogun/index.m3u8
-#EXTINF:-1 tvg-id="",EcuaMundo Radio TV (720p)
+#EXTINF:-1 tvg-id="EcuaMundoRadioTV.ec",EcuaMundo Radio TV (720p)
 https://pacific.direcnode.com:3353/live/ecuamundotvlive.m3u8
 #EXTINF:-1 tvg-id="Ecuavisa.ec",Ecuavisa (1080p) [Not 24/7]
 https://jireh-4-hls-video-us-isp.dps.live/hls-video/c54ac2799874375c81c1672abb700870537c5223/ecuavisa/ecuavisa.smil/playlist.m3u8
@@ -41,27 +41,29 @@ https://vid2.ecuamedia.net/educatv/live/playlist.m3u8
 https://server40.servistreaming.com:3174/live/elsolnetworklive.m3u8
 #EXTINF:-1 tvg-id="ElSolTV.ec",El Sol Radio y Televisión (404p) [Not 24/7]
 http://streaming5.globalhostla.com/rtplive/elsolrad/playlist.m3u8
-#EXTINF:-1 tvg-id="",Ficoa TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="FicoaTV.ec",Ficoa TV (720p) [Not 24/7]
 https://ssh101-fl.bozztv.com/ssh101/FicoaTVM/playlist.m3u8
 #EXTINF:-1 tvg-id="FMMundo.ec",FM Mundo (1080p)
 https://video2.makrodigital.com/fmmundo/fmmundo/playlist.m3u8
 #EXTINF:-1 tvg-id="HechosEcuador.ec",Hechos Ecuador (480p) [Not 24/7]
 https://stmv.streamingvip.click/hechosecuador/hechosecuador/playlist.m3u8
-#EXTINF:-1 tvg-id="",IeanJesus Ecuador (720p)
+#EXTINF:-1 tvg-id="IeanJesusEcuador.ec",IeanJesus Ecuador (720p)
 https://cloud37.ecuatel.com/iglesia2020/Stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="",Infinita TV (1080p)
+#EXTINF:-1 tvg-id="InfinitaTV.ec",Infinita TV (1080p)
 https://s2.tvdatta.com:3753/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="IntiTV.ec",Inti TV (1080p)
 https://5e2f36bc1c433.streamlock.net/inti/inti-network.stream/.m3u8
-#EXTINF:-1 tvg-id="",La Perla Radio TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="LaNuevaRadioTV977.ec",La Nueva Radio TV 97.7 (720p)
+https://cp.panelchs.com:1936/8112/8112/playlist.m3u8
+#EXTINF:-1 tvg-id="LaPerlaRadioTV.ec",La Perla Radio TV (720p) [Not 24/7]
 https://eu1.servers10.com:8081/8068/index.m3u8
-#EXTINF:-1 tvg-id="",La Pipol Tv Sangolquí (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="LaPipolTv.ec",La Pipol Tv Sangolquí (360p) [Not 24/7]
 https://cp.panelchs.com:1936/8004/8004/playlist.m3u8
-#EXTINF:-1 tvg-id="",La Victoria TV (720p)
+#EXTINF:-1 tvg-id="LaVictoriaTV.ec",La Victoria TV (720p)
 https://paneltv.jlsolutionpc.com:3379/live/victorialive.m3u8
 #EXTINF:-1 tvg-id="LatacungaTV.ec",LatacungaTV (720p)
 https://ssh101.bozztv.com/ssh101/streamlatacungatv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Latina Mix Radio Tv (360p)
+#EXTINF:-1 tvg-id="LatinaMixRadioTv.ec",Latina Mix Radio Tv (360p)
 https://srv.panelcast.net/latinamixtvtv2021/latinamixtvtv2021/playlist.m3u8
 #EXTINF:-1 tvg-id="LoretoTV.ec",Loreto TV (720p)
 https://stmv1.voxplayer.com.br/vidieg12/vidieg12/playlist.m3u8
@@ -75,7 +77,7 @@ https://eu1.servers10.com:8081/8030/index.m3u8
 https://eu1.servers10.com:8081/8028/index.m3u8
 #EXTINF:-1 tvg-id="MetropoliMediosTV.ec",Metropoli Medios TV (720p)
 https://eu1.servers10.com:8081/8214/index.m3u8
-#EXTINF:-1 tvg-id="",Monse Teve (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MonseTeve.ec",Monse Teve (720p) [Not 24/7]
 https://cp.panelchs.com:1936/jczwykvkpm/jczwykvkpm/playlist.m3u8
 #EXTINF:-1 tvg-id="MulticanalCatamayo.ec",Multicanal Catamayo (720p) [Not 24/7]
 https://multicanal.streamseguro.com/hls/streaming.m3u8
@@ -85,11 +87,11 @@ https://plataformavideo.com/live/nortvision.m3u8
 https://cloudvideo.servers10.com:8081/8118/index.m3u8
 #EXTINF:-1 tvg-id="OromarTV.ec",Oromar TV (720p)
 https://stream.oromartv.com:8082/hls/oromartv_hi/index.m3u8
-#EXTINF:-1 tvg-id="",Pantalla Clásica EC (512p)
+#EXTINF:-1 tvg-id="PantallaClasicaEC.ec",Pantalla Clásica EC (512p)
 https://ssh101-fl.bozztv.com/ssh101/ecuadoralmundo/playlist.m3u8
 #EXTINF:-1 tvg-id="",Plus TV (720p) [Not 24/7]
 https://plustv.streamseguro.com:5443/LiveApp/streams/streaming.m3u8
-#EXTINF:-1 tvg-id="",PrensaEc (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PrensaEc.ec",PrensaEc (720p) [Not 24/7]
 https://ssh101-fl.bozztv.com/ssh101/prensaec/playlist.m3u8
 #EXTINF:-1 tvg-id="PrincesaEstereoTV.ec",Princesa Estéreo TV (720p)
 https://cp.panelchs.com:1936/8006/8006/playlist.m3u8
@@ -97,29 +99,29 @@ https://cp.panelchs.com:1936/8006/8006/playlist.m3u8
 https://live.tvcontrolcp.com:1936/puruwatv/puruwatv/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioAlegria985FM.ec",Radio Alegria 98.5 FM (720p)
 https://video.compuwebecuador.com:3880/stream/play.m3u8
-#EXTINF:-1 tvg-id="",Radio Bonita 106.7 (720p)
+#EXTINF:-1 tvg-id="RadioBonita1067.ec",Radio Bonita 106.7 (720p)
 https://cloudvideo.servers10.com:8081/8154/index.m3u8
 #EXTINF:-1 tvg-id="RadioCuencaEstereo.ec",Radio Cuenca Estéreo (720p)
 https://eu1.servers10.com:8081/8074/index.m3u8
-#EXTINF:-1 tvg-id="",Radio Fantástica 98.9 FM (1080p)
+#EXTINF:-1 tvg-id="RadioFantastica989FM.ec",Radio Fantástica 98.9 FM (1080p)
 http://190.107.232.9:8082/livestream/stream.m3u8
 #EXTINF:-1 tvg-id="RadioImpacto2.ec",Radio Impacto 2 (1080p) [Not 24/7]
 https://inliveserver.com:1936/17518/17518/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioLaOriginalTV.ec",Radio La Original TV (1080p)
 https://cloudvideo.servers10.com:8081/8216/index.m3u8
-#EXTINF:-1 tvg-id="",Radio Monumental TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioMonumentalTV.ec",Radio Monumental TV (720p) [Not 24/7]
 https://cloud37.ecuatel.com/monumentaltv/live/manifest.m3u8
-#EXTINF:-1 tvg-id="",Radio Rocafuerte TV (720p)
+#EXTINF:-1 tvg-id="RadioRocafuerteTV.ec",Radio Rocafuerte TV (720p)
 https://stmv.streamingvip.click/rocafuertefm/rocafuertefm/playlist.m3u8
 #EXTINF:-1 tvg-id="RTS.ec",RTS (480p)
 https://d2vb5iv6i34lh5.cloudfront.net/RTSEC/93fc3c04cedad73f1f80aebf11451d53.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="RTU.ec",RTU (1080p) [Not 24/7]
 https://video1.makrodigital.com/rtu/rtu/chunks.m3u8?nimblesessionid=
-#EXTINF:-1 tvg-id="",RTV Naranjal (720p)
+#EXTINF:-1 tvg-id="RTVNaranjal.ec",RTV Naranjal (720p)
 https://cp.panelchs.com:1936/rtsgctweku/rtsgctweku/playlist.m3u8
-#EXTINF:-1 tvg-id="",RTV Riobamba (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RTV.ec",RTV Riobamba (720p) [Not 24/7]
 https://sv72.ecuaradiotv.net/rtvhd/live/manifest.m3u8
-#EXTINF:-1 tvg-id="",Scandalo TV (720p)
+#EXTINF:-1 tvg-id="ScandaloTV.ec",Scandalo TV (720p)
 https://ssh101-fl.bozztv.com/ssh101/scandalotv/index.m3u8
 #EXTINF:-1 tvg-id="SenalPositivaTV.ec",Señal Positiva TV (1080p)
 https://eu1.servers10.com:8081/8108/index.m3u8
@@ -127,23 +129,23 @@ https://eu1.servers10.com:8081/8108/index.m3u8
 https://live.obslivestream.com/sonoondatv/index.m3u8
 #EXTINF:-1 tvg-id="Teleamazonas.ec",Teleamazonas (1080p) [Geo-blocked]
 https://teleamazonas-live.cdn.vustreams.com/live/0fc97608-6057-4db8-9af7-102c21ac18af/live.isml/0fc97608-6057-4db8-9af7-102c21ac18af.m3u8
-#EXTINF:-1 tvg-id="",Teledigital (240p) [Not 24/7]
+#EXTINF:-1 tvg-id="Teledigital.ec",Teledigital (240p) [Not 24/7]
 https://tv.portalexpress.es:3182/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="Telerama.ec",Telerama (240p) [Not 24/7]
 https://envivo.telerama.ec/stream.m3u8
 #EXTINF:-1 tvg-id="TVAustro.ec",TV Austro (720p) [Not 24/7]
 https://cp.panelchs.com:1936/8148/8148/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV Color Canal 36 (720p)
+#EXTINF:-1 tvg-id="TVColorCanal36.ec",TV Color Canal 36 (720p)
 https://video.compuwebecuador.com:3067/live/tvcolorlive.m3u8
 #EXTINF:-1 tvg-id="TVLegislativa.ec",TV Legislativa (1080p)
 http://181.198.32.153:8080/hls/stream.m3u8
 #EXTINF:-1 tvg-id="TVC.ec",TVC (480p)
 https://d2vb5iv6i34lh5.cloudfront.net/TVCEC/d58f5eb5cbb9ad9c56649a0083de7c8b.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",UEBI TV Online (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="UEBITVOnline.ec",UEBI TV Online (720p) [Not 24/7]
 https://cloud2.streaminglivehd.com:1936/uebi/uebi/playlist.m3u8
-#EXTINF:-1 tvg-id="",UNIANDES TV (720p)
+#EXTINF:-1 tvg-id="UNIANDESTV.ec",UNIANDES TV (720p)
 https://video.compuwebecuador.com:3323/live/uniandeslive.m3u8
-#EXTINF:-1 tvg-id="",Vos y TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="VosyTV.ec",Vos y TV (720p) [Not 24/7]
 https://cloud37.ecuatel.com/vostv/live/manifest.m3u8
 #EXTINF:-1 tvg-id="WuanPlus.ec",Wuan+ (1080p)
 https://video2.makrodigital.com/wuanplus/wuanplus/playlist.m3u8
diff --git a/streams/ee.m3u b/streams/ee.m3u
index ce41e0267..64f79fe3c 100644
--- a/streams/ee.m3u
+++ b/streams/ee.m3u
@@ -11,7 +11,7 @@ https://sb.err.ee/live/etvpluss.m3u8
 http://lifetv.bitflip.ee/live/stream1_1/index.m3u8
 #EXTINF:-1 tvg-id="LifeTV.ee",Life TV (432p) [Not 24/7]
 https://lifetv.bitflip.ee/live/stream1.m3u8
-#EXTINF:-1 tvg-id="",Pingviin (576p)
+#EXTINF:-1 tvg-id="Pingviin.ee",Pingviin (576p)
 https://void.greenhosting.ru/PingviinEE_Mpeg4/index.m3u8
 #EXTINF:-1 tvg-id="Riigikogu.ee",Riigikogu (720p)
 https://le02.euddn.net/6487956abb8faf0706d8c4c2465f54cb3625b812fec8e13d11668907ff00f44b004ea22691a9216c71ebda22b7e6e57c8b923aeee9e1e6aa447947c014b7a3babd73ab865562f4ae463ce0c617da65805296ed52a0af64d7d881781d282ea970de7a1ab524c1ea73e271a8df71d43212f4850e2d81241308886184db1abf516f2d6d0b9965402fc7c960e27fa968eabb077474e7493c278ebae58d614923fb2f5c76c2865cb681763ffd765a39a629ce/smil:rk_live_1.smil/playlist.m3u8
diff --git a/streams/eg.m3u b/streams/eg.m3u
index be99ba9b0..c690b90ca 100644
--- a/streams/eg.m3u
+++ b/streams/eg.m3u
@@ -13,7 +13,7 @@ https://alfat7-q.com:5443/LiveApp/streams/986613792230697141226562.m3u8
 https://alfat7-q.com:5443/LiveApp/streams/515112551489055772942045.m3u8
 #EXTINF:-1 tvg-id="AlhayatTV.eg",Alhayat TV (720p)
 https://cdn3.wowza.com/5/OE5HREpIcEkySlNT/alhayat-live/ngrp:livestream_all/playlist.m3u8
-#EXTINF:-1 tvg-id="",ATVSat (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ATVSat.us",ATVSat (1080p) [Not 24/7]
 https://stream.atvsat.com/atvsatlive/smil:atvsatlive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CopticTV.eg",Coptic TV (720p)
 https://58cc65c534c67.streamlock.net/ctvchannel.tv/ctv.smil/playlist.m3u8
@@ -25,7 +25,7 @@ https://cdg8.edge.technocdn.com/daawahtv/live/playlist.m3u8
 https://9090video.mobtada.com/hls/stream.m3u8
 #EXTINF:-1 tvg-id="",Elsharq TV (1080p) [Not 24/7]
 https://mn-nl.mncdn.com/elsharq_live/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",HBC
+#EXTINF:-1 tvg-id="HBC.eg",HBC
 https://ffs3.gulfsat.com/hbc/index.m3u8
 #EXTINF:-1 tvg-id="HudaTV.eg",Huda TV (720p) [Not 24/7]
 https://cdn.bestream.io:19360/elfaro1/elfaro1.m3u8
diff --git a/streams/es.m3u b/streams/es.m3u
index 87c2675bb..774236fe6 100644
--- a/streams/es.m3u
+++ b/streams/es.m3u
@@ -177,7 +177,7 @@ https://cloudvideo.servers10.com:8081/8024/index.m3u8
 https://rtvelivestream.akamaized.net/rtvesec/clan/clan_main_dvr.m3u8
 #EXTINF:-1 tvg-id="Clan.es",Clan TVE (1080p) [Geo-blocked]
 https://ztnr.rtve.es/ztnr/5466990.m3u8
-#EXTINF:-1 tvg-id="",Clan TVE Internacional (1080p)
+#EXTINF:-1 tvg-id="ClanInternacional.es",Clan TVE Internacional (1080p)
 https://rtvelivestream.akamaized.net/rtvesec/int/clan_int_main.m3u8
 #EXTINF:-1 tvg-id="CMMTV.es",CMM TV (1080p) [Not 24/7]
 https://cdnapi.kaltura.com/p/2288691/sp/228869100/playManifest/entryId/1_01fn4ycl/format/applehttp/.m3u8
diff --git a/streams/et.m3u b/streams/et.m3u
index a7f1c6f6b..3d63acff6 100644
--- a/streams/et.m3u
+++ b/streams/et.m3u
@@ -3,7 +3,7 @@
 https://rrsatrtmp.tulix.tv/addis1/addis1multi.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="EBSCinema.us",EBS Cinema (720p)
 https://rpn.bozztv.com/ebstv/ebscinema/index.m3u8
-#EXTINF:-1 tvg-id="",EBS HD (1080p)
+#EXTINF:-1 tvg-id="EBSHD.us",EBS HD (1080p)
 https://rpn.bozztv.com/ebstv/ebstv/index.m3u8
 #EXTINF:-1 tvg-id="EBSMusika.us",EBS Musika (720p)
 https://rpn.bozztv.com/ebstv/ebsmusika/index.m3u8
diff --git a/streams/fi.m3u b/streams/fi.m3u
index 05ba7300a..b5ac219cd 100644
--- a/streams/fi.m3u
+++ b/streams/fi.m3u
@@ -9,13 +9,13 @@ https://live-fi.tvkaista.net/frii/live.m3u8
 https://live-fi.tvkaista.net/hero/live.m3u8?hd=true
 #EXTINF:-1 tvg-id="HimlenTV7.fi",Himlen TV7 (720p)
 https://vod.tv7.fi/tv7-se/smil:tv7-se.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",IRR-TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="IRRTV.fi",IRR-TV (576p) [Not 24/7]
 https://irrtv.digitacdn.net/live/_definst_/irrtv/amlst:irrtv.amlst/playlist.m3u8
-#EXTINF:-1 tvg-id="",IskelmäTV (720p)
+#EXTINF:-1 tvg-id="IskelmaTV.fi",IskelmäTV (720p)
 https://mobiili.livetv.fi/memfs/f1819b9e-90da-408a-9a71-5c54e0cb5c33.m3u8
 #EXTINF:-1 tvg-id="Jim.fi",Jim (720p)
 https://live-fi.tvkaista.net/jim/live.m3u8?hd=true
-#EXTINF:-1 tvg-id="",JRTV Järviradio (720p)
+#EXTINF:-1 tvg-id="JRTVJarviradio.fi",JRTV Järviradio (720p)
 https://streamer.radiotaajuus.fi/memfs/47f113bf-04ea-493b-a9d4-52945fd9db31.m3u8
 #EXTINF:-1 tvg-id="KotiTV.fi",KotiTV (720p) [Not 24/7]
 https://kotitv.digitacdn.net/amlst:kotitv.amlst/playlist.m3u8
@@ -40,7 +40,7 @@ https://hls.navahang.live/hls/stream.m3u8
 https://live-fi.tvkaista.net/nelonen/live.m3u8
 #EXTINF:-1 tvg-id="NopolaNews.fi",Nopola News (1080p) [Not 24/7]
 https://virta2.nopolanews.fi:8443/live/smil:Stream1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Onni TV (720p)
+#EXTINF:-1 tvg-id="OnniTV.fi",Onni TV (720p)
 https://onnitv.digitacdn.net/live/ott/onnitv/playlist.m3u8
 #EXTINF:-1 tvg-id="",STAR Channel (Finland) (720p)
 https://live-fi.tvkaista.net/star-channel/live.m3u8?hd=true
@@ -64,5 +64,5 @@ https://yletvworld.akamaized.net/hls/live/622541/yletv2w/index.m3u8
 https://yletv.akamaized.net/hls/live/622367/yletvteemafemfin/playlist.m3u8
 #EXTINF:-1 tvg-id="YleTeemaFem.fi",YLE TV Teema & Fem (1080p) [Not 24/7]
 https://yletvworld.akamaized.net/hls/live/622547/yletvteemafemw/index.m3u8
-#EXTINF:-1 tvg-id="",YleX Studio Live (720p)
+#EXTINF:-1 tvg-id="YleX.fi",YleX Studio Live (720p)
 https://ylestudiolive.akamaized.net/hls/live/2007826/ylestudiolive-YleX/master.m3u8
diff --git a/streams/fi_samsung.m3u b/streams/fi_samsung.m3u
index c8223b429..6e1faebc5 100644
--- a/streams/fi_samsung.m3u
+++ b/streams/fi_samsung.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",AfricaNews English (720p)
+#EXTINF:-1 tvg-id="AfricanewsEnglish.fr",AfricaNews English (720p)
 https://rakuten-africanews-1-fi.samsung.wurl.tv/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1-fi.samsung.wurl.tv/manifest/playlist.m3u8
diff --git a/streams/fr.m3u b/streams/fr.m3u
index eb50ccf9a..e62761f17 100644
--- a/streams/fr.m3u
+++ b/streams/fr.m3u
@@ -7,7 +7,7 @@ https://video1.getstreamhosting.com:1936/8420/8420/playlist.m3u8
 https://samsunguk-adn-samsung-fre-qfrlc.amagi.tv/playlist/samsunguk-adn-samsung-fre/playlist.m3u8
 #EXTINF:-1 tvg-id="Africa24.fr",Africa 24 (540p)
 https://edge12.vedge.infomaniak.com/livecast/ik:africa24/manifest.m3u8
-#EXTINF:-1 tvg-id="",Africa 24 English (1080p)
+#EXTINF:-1 tvg-id="Africa24English.fr",Africa 24 English (1080p)
 https://edge17.vedge.infomaniak.com/livecast/ik:africa24sport/manifest.m3u8
 #EXTINF:-1 tvg-id="AlpedHuezTV.fr",Alpe d’Huez TV (720p) [Not 24/7]
 https://edge.vedge.infomaniak.com/livecast/ik:adhtv/chunklist.m3u8
@@ -33,7 +33,7 @@ https://raw.githubusercontent.com/Paradise-91/ParaTV/main/streams/canalplus/c8.m
 http://livevideo.vedge.infomaniak.com/livecast/ik:canal32/manifest.m3u8
 #EXTINF:-1 tvg-id="Canal32.fr",Canal 32 (480p)
 https://edge13.vedge.infomaniak.com/livecast/ik:canal32/manifest.m3u8
-#EXTINF:-1 tvg-id="",Cannes Lérins TV (1080p)
+#EXTINF:-1 tvg-id="CannesLerinsTV.fr",Cannes Lérins TV (1080p)
 https://vdo2.pro-fhi.net:3628/live/uppodsfqlive.m3u8
 #EXTINF:-1 tvg-id="CDirect.fr",CDirect (360p)
 http://51.254.199.122:8080/cdirectTV/index.m3u8
@@ -75,7 +75,7 @@ http://mv2.tvfrancophonie.org/live/Stream1/playlist.m3u8
 https://5421175365ea3.streamlock.net/live/smil:switch.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="FunRadio.fr",Fun Radio (720p)
 https://livevideo.infomaniak.com/streaming/livecast/funradiovisionhd/playlist.m3u8
-#EXTINF:-1 tvg-id="",FX2 Farsi
+#EXTINF:-1 tvg-id="FX2.fr",FX2 Farsi
 https://toonixhls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="GenerationsTV.fr",Generations TV (576p)
 https://edge.vedge.infomaniak.com/livecast/ik:generation-tv/manifest.m3u8
@@ -197,7 +197,7 @@ https://live.creacast.com/mirabelletv/smil:mirabelletv.smil/playlist.m3u8
 https://streamer01.myvideoplace.tv/streamer02/hls/MDS_VIA_PAD_301117.m3u8
 #EXTINF:-1 tvg-id="viaTelePaese.fr",viàTéléPaese (720p)
 https://srv.webtvmanager.fr:3118/live/viatelepaeselive.m3u8
-#EXTINF:-1 tvg-id="",VOIE TV (720p)
+#EXTINF:-1 tvg-id="VOIETV.fr",VOIE TV (720p)
 https://ssh101-fl.bozztv.com/ssh101/matelevisionweb/index.m3u8
 #EXTINF:-1 tvg-id="VosgesTV.fr",Vosges Télévision (576p) [Not 24/7]
 https://vosgestv.live-kd.com/live/vosgestv/vosgestv/playlist.m3u8
@@ -205,5 +205,5 @@ https://vosgestv.live-kd.com/live/vosgestv/vosgestv/playlist.m3u8
 https://live.digiteka.com/1/WGQ1NnhEN0lzM0NU/dk1EOHhw/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="Weo.fr",Wéo (Picardie) (480p) [Not 24/7]
 https://live.digiteka.com/1/Zks2L0VsM2V0T242/QTBqcFly/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",XilamTV (1080p)
+#EXTINF:-1 tvg-id="XilamTV.fr",XilamTV (1080p)
 https://xilam-animation-1-fr.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/fr_bfm.m3u b/streams/fr_bfm.m3u
index 38d7a87a4..b2337e897 100644
--- a/streams/fr_bfm.m3u
+++ b/streams/fr_bfm.m3u
@@ -11,7 +11,7 @@ https://ncdn-live-bfm.pfd.sfr.net/shls/LIVE$BFM_BUSINESS/index.m3u8?end=END&star
 #EXTINF:-1 tvg-id="BFMDICIAlpesduSud.fr" user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",BFM DICI Alpes du Sud (1080p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36
 https://ncdn-live-bfm.pfd.sfr.net/shls/LIVE$BFM_DICI_ALPESDUSUD/index.m3u8?end=END&start=LIVE
-#EXTINF:-1 tvg-id="" user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",BFM DICI Haute-Provence (1080p)
+#EXTINF:-1 tvg-id="BFMDICIHauteProvence.fr" user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",BFM DICI Haute-Provence (1080p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36
 https://ncdn-live-bfm.pfd.sfr.net/shls/LIVE$BFM_DICI_HAUTEPROVENCE/index.m3u8?end=END&start=LIVE
 #EXTINF:-1 tvg-id="BFMGrandLille.fr" user-agent="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",BFM Grand Lille (1080p)
diff --git a/streams/fr_persiana.m3u b/streams/fr_persiana.m3u
index 748d62289..4001d1e24 100644
--- a/streams/fr_persiana.m3u
+++ b/streams/fr_persiana.m3u
@@ -23,7 +23,7 @@ https://noshls.persiana.live/hls/stream.m3u8
 https://onehls.persiana.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="PersianaRap.fr",Persiana Rap
 https://raphls.persiana.live/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",Persiana Science
+#EXTINF:-1 tvg-id="PersianaScience.fr",Persiana Science
 https://scihls.persiana.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="PersianaSonnati.fr",Persiana Sonnati
 https://sonhls.persiana.live/hls/stream.m3u8
@@ -31,7 +31,7 @@ https://sonhls.persiana.live/hls/stream.m3u8
 https://persiana.mastercast.cloud/memfs/f1accec0-3b52-476b-ada9-65f74ead985e.m3u8
 #EXTINF:-1 tvg-id="PersianaSports.fr",Persiana Sports (720p)
 https://af.ayas.ir/hls2/persiana.m3u8
-#EXTINF:-1 tvg-id="",Persiana Turkiye
+#EXTINF:-1 tvg-id="PersianaTurkiye.fr",Persiana Turkiye
 https://turkhls.persiana.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="PokerTV.fr",Poker TV (720p)
 https://hls.pokertvfa.live/hls/stream.m3u8
diff --git a/streams/fr_pluto.m3u b/streams/fr_pluto.m3u
index d3a5fb0e8..4d52b4150 100644
--- a/streams/fr_pluto.m3u
+++ b/streams/fr_pluto.m3u
@@ -27,7 +27,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/63
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65bd05483a11680007813560/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e074d43-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=e6543233-9385-400c-9f39-b1ad35070504
 #EXTINF:-1 tvg-id="",CATFISH TV
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5f8eb66537867f0007146953/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e04b530-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=49bb6c77-a3e5-4314-90b2-4494da60cda0
-#EXTINF:-1 tvg-id="",CBS News 24/7
+#EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6231ec93779a9d00079ba8e2/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0689f3-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=fed25d80-74f3-47d1-a87b-51755ac6ef8a
 #EXTINF:-1 tvg-id="",Charlotte aux Fraises
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60dc6937b450ad0007377e48/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=8e0614c7-1f2c-11ef-86d8-5d587df108c6&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=647718a5-2915-4d3e-af3e-84f437cb7b7e
diff --git a/streams/ga.m3u b/streams/ga.m3u
index aa05308a9..f21a75642 100644
--- a/streams/ga.m3u
+++ b/streams/ga.m3u
@@ -5,7 +5,7 @@ https://vps73918.serveur-vps.net/hls/ggtv.m3u8
 https://live3.acangroup.org:1929/publiclive/labeltv/chunks.m3u8
 #EXTINF:-1 tvg-id="NourTV.ga",Nour TV (720p)
 https://helga.iptv2022.com/sh/Nour_tv/index.m3u8
-#EXTINF:-1 tvg-id="",Proximité Web TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ProximiteWebTV.ga",Proximité Web TV (480p) [Not 24/7]
 https://helga.iptv2022.com/sh/PROXIMITE_WEB_TV/index.m3u8
 #EXTINF:-1 tvg-id="TeleAfrica.ga",Télé Africa (360p)
 http://185.59.221.131:8081/live/teleafrica/playlist.m3u8
diff --git a/streams/gf.m3u b/streams/gf.m3u
index aa4cd5d6a..ee7693ce7 100644
--- a/streams/gf.m3u
+++ b/streams/gf.m3u
@@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Yanahits TV (1080p)
+#EXTINF:-1 tvg-id="YanahitsTV.gf",Yanahits TV (1080p)
 https://rpn3.bozztv.com/ssh101/ssh101/clip/playlist.m3u8
diff --git a/streams/gh.m3u b/streams/gh.m3u
index d2122ba4a..e1ba27aa6 100644
--- a/streams/gh.m3u
+++ b/streams/gh.m3u
@@ -7,15 +7,15 @@ https://59d39900ebfb8.streamlock.net/adinkratvny/adinkratvny/playlist.m3u8
 https://livetv.tvait.com:1935/hls/stream1.m3u8
 #EXTINF:-1 tvg-id="Apple68TV.us",Apple68 TV (1080p)
 http://doxatv.flashmediacast.com:1935/doxatv/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="",CeeJay TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CeeJayTV.gh",CeeJay TV (480p) [Not 24/7]
 https://asiakwa.com/ceejaytv/index.fmp4.m3u8
-#EXTINF:-1 tvg-id="",ChannelOne TV (576p)
+#EXTINF:-1 tvg-id="ChannelOneTV.gh",ChannelOne TV (576p)
 https://2ctv.crystaltv.mobi:44095/tv877.167.m3u8
 #EXTINF:-1 tvg-id="EwenyigbaTV.de",Ewenyigba TV (720p)
 https://barakyah-hls.secdn.net/barakyah-channel/play/mp4:enyigba/playlist.m3u8
-#EXTINF:-1 tvg-id="",Faculty TV (720p)
+#EXTINF:-1 tvg-id="FacultyTV.gh",Faculty TV (720p)
 https://stream-server9-jupiter.muxlive.com/hls/facultytv/index.m3u8
-#EXTINF:-1 tvg-id="",GHLife TV (720p)
+#EXTINF:-1 tvg-id="GHLifeTV.gh",GHLife TV (720p)
 https://stream-server9-jupiter.muxlive.com/hls/ghlifetv/index.m3u8
 #EXTINF:-1 tvg-id="GHtvHolland.nl",GHtv Holland (720p)
 http://37.48.120.77:8080/hls/ghtvonline.m3u8
diff --git a/streams/gn.m3u b/streams/gn.m3u
index 3d36f8109..f085349fd 100644
--- a/streams/gn.m3u
+++ b/streams/gn.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",ATV (400p) [Not 24/7]
+#EXTINF:-1 tvg-id="ATV.gn",ATV (400p) [Not 24/7]
 https://guineetvdirect.online:3320/live/atvguineelive.m3u8
-#EXTINF:-1 tvg-id="",Cavi TV (400p)
+#EXTINF:-1 tvg-id="CaviTV.gn",Cavi TV (400p)
 https://helga.iptv2022.com/Cavi_TV/index.m3u8
 #EXTINF:-1 tvg-id="CISTV.gn",CIS TV (360p)
 http://185.59.221.131:8081/live/cistv/playlist.m3u8
@@ -9,11 +9,11 @@ http://185.59.221.131:8081/live/cistv/playlist.m3u8
 https://edge11.vedge.infomaniak.com/livecast/ik:espacetv/manifest.m3u8
 #EXTINF:-1 tvg-id="EvasionTV.gn",Evasion TV (720p)
 https://kali1.everestcast.com:3235/live/visionweblive.m3u8
-#EXTINF:-1 tvg-id="",Fasso TV Kankan (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="FassoTVKankan.gn",Fasso TV Kankan (720p) [Not 24/7]
 https://cageu.bozztv.com/ssh101/ssh101/fassotv1/playlist.m3u8
 #EXTINF:-1 tvg-id="GuineeTV1.gn",Guinée TV1 (720p) [Not 24/7]
 https://helga.iptv2022.com/GTV/index.m3u8
-#EXTINF:-1 tvg-id="",Kaback TV (720p)
+#EXTINF:-1 tvg-id="KabackTV.gn",Kaback TV (720p)
 https://guineetvdirect.online:3842/live/kabacktvlive.m3u8
 #EXTINF:-1 tvg-id="KalacTV.gn",Kalac TV (1080p)
 https://edge.vedge.infomaniak.com/livecast/ik:kalactv/manifest.m3u8
@@ -23,5 +23,5 @@ https://stream.castr.com/6358a30fa50e3ae11b6d0424/live_e05d20809c3611edadb721773
 #EXTINF:-1 tvg-id="RTG2.gn",RTG 2 (240p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_cbde16509c3611ed91f289dac03ffaaf
 https://stream.castr.com/6358a30fa50e3ae11b6d0424/live_cbde16509c3611ed91f289dac03ffaaf/index.m3u8
-#EXTINF:-1 tvg-id="",Sab TV (720p)
+#EXTINF:-1 tvg-id="SabTV.gn",Sab TV (720p)
 https://guineetvdirect.online:3964/live/sabtvlive.m3u8
diff --git a/streams/gp.m3u b/streams/gp.m3u
index 07514e4a0..dc266db2e 100644
--- a/streams/gp.m3u
+++ b/streams/gp.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ETV.gp",ETV (1080p)
 https://edge.vedge.infomaniak.com/livecast/ik:etvgp/manifest.m3u8
-#EXTINF:-1 tvg-id="",Madras FM TV (1080p)
+#EXTINF:-1 tvg-id="MadrasFMTV.gp",Madras FM TV (1080p)
 https://edge12.vedge.infomaniak.com/livecast/ik:madrasfmtv/manifest.m3u8
-#EXTINF:-1 tvg-id="",Radio TV Basse-Terre (720p)
+#EXTINF:-1 tvg-id="RadioTVBasseTerre.gp",Radio TV Basse-Terre (720p)
 https://vdo.ssl-stream.com:3412/stream/play.m3u8
 #EXTINF:-1 tvg-id="RHTGuadeloupe.gp",RHT Guadeloupe (720p)
 https://edge12.vedge.infomaniak.com/livecast/ik:livehautetension/manifest.m3u8
diff --git a/streams/gq.m3u b/streams/gq.m3u
index 39370c39a..0d3abb25a 100644
--- a/streams/gq.m3u
+++ b/streams/gq.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AsongaTV.gq",Asonga TV (1080p)
 https://86060.global.ssl.fastly.net/5ec1843635bd933ad25fe22e/live_e887acc04f7f11edb82e9f05583e4727/index.fmp4.m3u8
-#EXTINF:-1 tvg-id="",SolTV (720p)
+#EXTINF:-1 tvg-id="SolTV.gq",SolTV (720p)
 https://stream.solmediaeg.com/soltv/soltv.m3u8
 #EXTINF:-1 tvg-id="TVGE.gq",TVGE (480p)
 http://rtmp.ott.mx1.com/tvge1/tvge1multi.smil/playlist.m3u8
diff --git a/streams/gr.m3u b/streams/gr.m3u
index 0eb60e22c..5c659c3db 100644
--- a/streams/gr.m3u
+++ b/streams/gr.m3u
@@ -21,7 +21,7 @@ https://www.hellasnet.tv/rest2.live.hn/w2r.alf/playlist.m3u8
 http://alphatvlive.siliconweb.com/1/Y2Rsd1lUcUVoajcv/UVdCN25h/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="ANT1.gr",ANT1 (1080p) [Geo-blocked]
 http://d1nfykbwa3n98t.cloudfront.net/out/v1/6e5667da5a6843899a337dea72adb61b/antenna.m3u8
-#EXTINF:-1 tvg-id="",APT (1080p)
+#EXTINF:-1 tvg-id="ART.gr",APT (1080p)
 https://hugh.cdn.rumble.cloud/live/k5e12sb4/slot-82/fdd0-tbln/chunklist_DVR.m3u8
 #EXTINF:-1 tvg-id="ARTTV.gr",ART TV (720p)
 https://til.pp.ua:3711/live/arttvgr70live.m3u8
@@ -200,7 +200,7 @@ https://s1.cystream.net/live/smile/playlist.m3u8
 http://livestar.siliconweb.com/media/star1/star1mediumhd.m3u8
 #EXTINF:-1 tvg-id="StarChannel.gr",STAR HD [Non geo blocked]
 http://livestar.siliconweb.com/starvod/star4/star4.m3u8
-#EXTINF:-1 tvg-id="",STAR International (720p)
+#EXTINF:-1 tvg-id="StarChannelInternational.gr",STAR International (720p)
 https://livestar.siliconweb.com/starvod/star_int/star_int.m3u8
 #EXTINF:-1 tvg-id="StarKentrikisElladas.gr",Star Kentrikis Elladas (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com
diff --git a/streams/gt.m3u b/streams/gt.m3u
index f9a86ec55..49d13b2f4 100644
--- a/streams/gt.m3u
+++ b/streams/gt.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",A+ Guate (720p)
+#EXTINF:-1 tvg-id="APlusGuate.gt",A+ Guate (720p)
 https://ch2-tva.duin.dev/hls/stream.m3u8
 #EXTINF:-1 tvg-id="AmigosTVChiquimula.gt",Amigos TV Chiquimula (480p)
 https://tv91.hostingnuclear.com:19360/amigostv/amigostv.m3u8
@@ -11,7 +11,7 @@ https://ch1-tva.duin.dev/hls/stream.m3u8
 https://stream.oursnetworktv.com/latin/telegtmb/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal3.gt",Canal 3 (480p) [Not 24/7]
 https://dy434h3s52eoj.cloudfront.net/Canal3GT/01582b1c46c04a847aa7c4936d1eeba7.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 6 Panadish (720p)
+#EXTINF:-1 tvg-id="Canal6Panadish.gt",Canal 6 Panadish (720p)
 https://stream.meteorito.cloud:1947/canal6/smil:canal6.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal8SantaRosa.gt",Canal 8 Santa Rosa (720p)
 https://cdn.streamhispanatv.net:3697/live/canal8starosalive.m3u8
@@ -23,13 +23,13 @@ https://cdn.streamhispanatv.net:3859/live/ixchiguanlive.m3u8
 https://cdn.streamhispanatv.net:3237/live/canal9tvgtlive.m3u8
 #EXTINF:-1 tvg-id="Canal13Esquipulas.gt",Canal 13 Esquipulas (720p)
 https://tv91.hostingnuclear.com:19360/intercable/intercable.m3u8
-#EXTINF:-1 tvg-id="",Canal 20 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal20.gt",Canal 20 (720p) [Not 24/7]
 https://desuchi.com/streams/live/tv.m3u8
 #EXTINF:-1 tvg-id="Canal25Regional.gt",Canal 25 Regional (720p)
 https://srv6.zcast.com.br/canalsantarosa/canalsantarosa/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal27.gt",Canal 27 (1080p)
 https://live.canal27.tv:3633/live/canal27live.m3u8
-#EXTINF:-1 tvg-id="",Canal 30 TV Bethel (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal30TVBethel.gt",Canal 30 TV Bethel (720p) [Not 24/7]
 https://s.emisoras.tv:8081/canal30tvbethel/index.m3u8
 #EXTINF:-1 tvg-id="Telemax.gt",Canal 32 Telemax (720p) [Not 24/7]
 https://cdn.streamhispanatv.net:3824/live/telemaxlive.m3u8
@@ -45,7 +45,7 @@ https://stream.oursnetworktv.com/latin/IglesialuzyVerdad/playlist.m3u8
 https://cdn.streamhispanatv.net:3840/live/penielfamlive.m3u8
 #EXTINF:-1 tvg-id="CanalTVRadioMayaTGBA.gt",Canal TV Radio Maya TGBA (480p)
 https://stream.oursnetworktv.com/latin/radioTGBAgtm/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal Visof (720p)
+#EXTINF:-1 tvg-id="CanalVisof.gt",Canal Visof (720p)
 https://stream.oursnetworktv.com/latin/Visof/playlist.m3u8
 #EXTINF:-1 tvg-id="CandelariaTV.gt",Candelaria TV (720p) [Not 24/7]
 https://cdn.streamhispanatv.net:3921/live/candetvlive.m3u8
@@ -73,7 +73,7 @@ https://stream.oursnetworktv.com/latin/franchstv/playlist.m3u8
 https://cdn.streamhispanatv.net:3845/live/fullchannelgtlive.m3u8
 #EXTINF:-1 tvg-id="GardeniasTV.gt",Gardenias TV (720p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/gardeniasTv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Génesis TV (768p) [Not 24/7]
+#EXTINF:-1 tvg-id="GTV.gt",Génesis TV (768p) [Not 24/7]
 https://cdn.streamhispanatv.net:3126/live/genesistvlive.m3u8
 #EXTINF:-1 tvg-id="IglesiaDelCamino.gt",Iglesia Del Camino (480p) [Not 24/7]
 http://streamingcontrol.com:1935/ectv/ectv/playlist.m3u8
@@ -87,17 +87,17 @@ https://stream.oursnetworktv.com/latin/nissiGtmH/playlist.m3u8
 https://stream.oursnetworktv.com/latin/jubilotv/playlist.m3u8
 #EXTINF:-1 tvg-id="Knal4Quiche.gt",Knal 4 Quiché (720p) [Not 24/7]
 https://cdn.streamhispanatv.net:3482/live/knal4gtlive.m3u8
-#EXTINF:-1 tvg-id="",MÁS TV (720p)
+#EXTINF:-1 tvg-id="MASTV.gt",MÁS TV (720p)
 https://s.emisoras.tv:8081/mastvgt/playlist.m3u8
-#EXTINF:-1 tvg-id="",Maxivisión TV (720p)
+#EXTINF:-1 tvg-id="MaxivisionTV.gt",Maxivisión TV (720p)
 https://video03.logicahost.com.br/maxivisiontv/maxivisiontv/playlist.m3u8
-#EXTINF:-1 tvg-id="",MCN Televisión (768p)
+#EXTINF:-1 tvg-id="MCNTelevision.gt",MCN Televisión (768p)
 https://vdo.grupolimalive.com:3263/live/mcnlive.m3u8
 #EXTINF:-1 tvg-id="MiCanal.gt",Mi Canal (576p) [Not 24/7]
 http://ms.android-iptv.com/live/V7rA1feOk3/FkGkEh8Spe/6671.m3u8
-#EXTINF:-1 tvg-id="",Multivisión Canal 3 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MultivisionCanal3.gt",Multivisión Canal 3 (720p) [Not 24/7]
 https://stream.digitalgt.com:3136/live/multivisionlive.m3u8
-#EXTINF:-1 tvg-id="",Multivisión Sports (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MultivisionSports.gt",Multivisión Sports (720p) [Not 24/7]
 https://stream.digitalgt.com:3605/live/multivisionsportslive.m3u8
 #EXTINF:-1 tvg-id="NimTV.gt",Nim TV (720p) [Not 24/7]
 https://cdn.streamhispanatv.net:3210/live/nimtvgtlive.m3u8
@@ -129,7 +129,7 @@ https://live.appclicksgt.com:3522/hybrid/play.m3u8
 https://5e85d90130e77.streamlock.net/6006/6006/playlist.m3u8
 #EXTINF:-1 tvg-id="SASTV.gt",SAS TV (720p)
 https://cdn.streamhispanatv.net:3390/live/sastvgtlive.m3u8
-#EXTINF:-1 tvg-id="",Simclar TV (720p)
+#EXTINF:-1 tvg-id="SimclarTV.gt",Simclar TV (720p)
 https://s.emisoras.tv:8081/simclartv/playlist.m3u8
 #EXTINF:-1 tvg-id="SolTV.gt",Sol TV (720p)
 https://cdn.streamhispanatv.net:3409/live/soltvlive.m3u8
@@ -169,5 +169,5 @@ https://cdn.streamhispanatv.net:3531/live/tvsretrogtlive.m3u8
 https://cdn.streamhispanatv.net:3642/live/unicatvlive.m3u8
 #EXTINF:-1 tvg-id="VisionTV.gt",Visión TV (720p)
 https://cdn.streamhispanatv.net:3076/live/visiontvlive.m3u8
-#EXTINF:-1 tvg-id="",ZOE Visión TV (720p)
+#EXTINF:-1 tvg-id="ZOEVisionTV.gt",ZOE Visión TV (720p)
 https://live.zoevisiontv.com:3475/live/zoevisiontvlive.m3u8
diff --git a/streams/gy.m3u b/streams/gy.m3u
index 7c52a0689..406c96c12 100644
--- a/streams/gy.m3u
+++ b/streams/gy.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",FL Sport (1080p)
+#EXTINF:-1 tvg-id="FLSport.gy",FL Sport (1080p)
 https://tvsw5-hls.secdn.net/tvsw5-chorigin/play/prod-8ce1fcb47fa7474d84640eb766f0ef38/playlist.m3u8
 #EXTINF:-1 tvg-id="",Guyana Government Information (1080p)
 https://tvsw4-hls.secdn.net/tvsw4-chorigin/play/prod-ee2570f630944d15992df8863b9283cc/playlist.m3u8
diff --git a/streams/hn.m3u b/streams/hn.m3u
index bb757f8c0..0d16d6ab7 100644
--- a/streams/hn.m3u
+++ b/streams/hn.m3u
@@ -1,13 +1,13 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="45TV.hn",45 TV (720p)
 https://stream.alojamientowebgt.com:3656/live/tv45live.m3u8
-#EXTINF:-1 tvg-id="",504 TV (720p)
+#EXTINF:-1 tvg-id="504TV.hn",504 TV (720p)
 https://mediacp.us:8081/504tvhn/index.m3u8
 #EXTINF:-1 tvg-id="ActivaTV.hn",Activa TV (720p)
 https://videoserver.tmcreativos.com:19360/mbcrtzxnxd/mbcrtzxnxd.m3u8
 #EXTINF:-1 tvg-id="AlfaOmegaVision.hn",Alfa & Omega Vision (480p) [Not 24/7]
 https://srv.panelcast.net/dorian/dorian/playlist.m3u8
-#EXTINF:-1 tvg-id="",Alsacias Televisión (ATV | Canal 28) (720p)
+#EXTINF:-1 tvg-id="AlsaciasTelevision.hn",Alsacias Televisión (ATV | Canal 28) (720p)
 https://s.emisoras.tv:8081/atv/index.m3u8
 #EXTINF:-1 tvg-id="AvivaTV.hn",Aviva TV (288p) [Not 24/7]
 https://video.misistemareseller.com/atvhonduras/atvhonduras/playlist.m3u8
@@ -27,7 +27,7 @@ https://stream.oursnetworktv.com/latin/talangatv/playlist.m3u8
 https://mdstrm.com/live-stream-playlist/603d4e1fb042ce07c5c8f911.m3u8
 #EXTINF:-1 tvg-id="Canal15DTP.hn",Canal 15 DTP (352p)
 https://s.emisoras.tv:8081/dtp/index.m3u8
-#EXTINF:-1 tvg-id="",Canal 32 STO (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal32STO.hn",Canal 32 STO (720p) [Not 24/7]
 https://s.emisoras.tv:8081/stocanal32hn/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal51.hn",Canal 51 (720p)
 https://tvcn51.com/hls/cn51480.m3u8
@@ -37,11 +37,11 @@ https://cdn.playcloud.us/cci/srtin3.stream/playlist.m3u8
 http://audiotvserver.net:1935/livemedia/cholusat/playlist.m3u8
 #EXTINF:-1 tvg-id="CholutecaTV.hn",Choluteca TV (1080p)
 https://s.emisoras.tv:8081/cholutecatv/index.m3u8
-#EXTINF:-1 tvg-id="",CRTV Choluteca (720p)
+#EXTINF:-1 tvg-id="CRTelevisionCholuteca.hn",CRTV Choluteca (720p)
 https://www.televinterserver.com:19360/crtvcholuteca/crtvcholuteca.m3u8
 #EXTINF:-1 tvg-id="CTVInternacional.hn",CTV Internacional (1080p)
 https://mediacp.us:8081/ctvhn/index.m3u8
-#EXTINF:-1 tvg-id="",CVA TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CVATV.hn",CVA TV (480p) [Not 24/7]
 http://190.124.161.21:8086/cvatv/live.m3u8
 #EXTINF:-1 tvg-id="DiosTeVe.hn",Dios Te Ve (720p)
 https://s.emisoras.tv:8081/diostevetv/index.m3u8
@@ -51,31 +51,31 @@ https://s.emisoras.tv:8081/diostevekids/index.m3u8
 https://5e85d90130e77.streamlock.net/6010/ngrp:6010_all/playlist.m3u8
 #EXTINF:-1 tvg-id="EDNTV.hn",EDN TV (1080p) [Not 24/7]
 https://60417ddeaf0d9.streamlock.net/edntv/videoedntv/playlist.m3u8
-#EXTINF:-1 tvg-id="",EN TV (720p)
+#EXTINF:-1 tvg-id="ENTV.hn",EN TV (720p)
 https://cp.cast-live.net:1936/exodotv/exodotv/playlist.m3u8
 #EXTINF:-1 tvg-id="GirasolTV.hn",Girasol TV (720p)
 https://video.misistemareseller.com/Girasoltv/Girasoltv/playlist.m3u8
 #EXTINF:-1 tvg-id="GloboTV.hn",Globo TV (1080p) [Not 24/7]
 https://panel.dattalive.com/8122/8122/playlist.m3u8
-#EXTINF:-1 tvg-id="",Inmaculada TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="InmaculadaTV.hn",Inmaculada TV (1080p) [Not 24/7]
 https://rpn3.bozztv.com/ssh101/ssh101/inmaculadatv/playlist.m3u8
 #EXTINF:-1 tvg-id="JBNTV.hn",JBN (1080p)
 https://mediacp.us:8081/jbntv/index.m3u8
 #EXTINF:-1 tvg-id="JehovaTV.hn",Jehová TV (720p)
 https://video.misistemareseller.com/jehovatelevision/jehovatelevision/playlist.m3u8
-#EXTINF:-1 tvg-id="",Junco Tv (720p)
+#EXTINF:-1 tvg-id="JuncoTv.hn",Junco Tv (720p)
 https://mediacp.us:8081/juncotv/index.m3u8
 #EXTINF:-1 tvg-id="KerussoTV.hn",Kerusso TV (720p)
 https://s.emisoras.tv:8081/kerussotv/index.m3u8
-#EXTINF:-1 tvg-id="",La 98.1 TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="La981TV.hn",La 98.1 TV (720p) [Not 24/7]
 https://6019dcac4147f.streamlock.net:9443/la98/Invosa/playlist.m3u8
-#EXTINF:-1 tvg-id="",La Top 102.9 (720p)
+#EXTINF:-1 tvg-id="LaTop1029.hn",La Top 102.9 (720p)
 https://59d39900ebfb8.streamlock.net/top102/top102/playlist.m3u8
-#EXTINF:-1 tvg-id="",La Top 107.7 (720p)
+#EXTINF:-1 tvg-id="LaTop1077.hn",La Top 107.7 (720p)
 https://59d39900ebfb8.streamlock.net/top107/top107/playlist.m3u8
 #EXTINF:-1 tvg-id="LencaTV.hn",Lenca Television Canal 40 (720p) [Not 24/7]
 https://lencatelevision.com/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",Litoral Atlántico HD (720p)
+#EXTINF:-1 tvg-id="LitoralAtlanticoHD.hn",Litoral Atlántico HD (720p)
 https://cdn4.streamgato.us:3595/live/litoralhdlive.m3u8
 #EXTINF:-1 tvg-id="LTV.hn",LTV (720p) [Not 24/7]
 https://5e85d90130e77.streamlock.net/6022/6022/playlist.m3u8
@@ -87,9 +87,9 @@ https://media.streambrothers.com:19360/8356/8356.m3u8
 https://s.emisoras.tv:8081/metrotv/index.m3u8
 #EXTINF:-1 tvg-id="RadioOmegaTV.hn",Omega TV (720p) [Not 24/7]
 https://5caf24a595d94.streamlock.net:1937/8142/8142/playlist.m3u8
-#EXTINF:-1 tvg-id="",Paradise TV (720p)
+#EXTINF:-1 tvg-id="ParadiseTV.hn",Paradise TV (720p)
 https://s2.tvdatta.com:3840/live/paradisetvlive.m3u8
-#EXTINF:-1 tvg-id="",Puringla TV (720p)
+#EXTINF:-1 tvg-id="PuringlaTV.hn",Puringla TV (720p)
 https://stmv1.srvif.com/puringla/puringla/playlist.m3u8
 #EXTINF:-1 tvg-id="QhuboTV.hn",Q'hubo TV (410p) [Not 24/7]
 https://5e85d90130e77.streamlock.net/6024/6024/playlist.m3u8
@@ -97,7 +97,7 @@ https://5e85d90130e77.streamlock.net/6024/6024/playlist.m3u8
 https://www.idealfm104-7.com/hls/0/stream.m3u8
 #EXTINF:-1 tvg-id="ImagenFM1051.hn",Radio Imagen 105.1 FM (720p) [Not 24/7]
 https://streaming.imagenfm105-1.com/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",RCV TV (712p)
+#EXTINF:-1 tvg-id="RCVTV.hn",RCV TV (712p)
 https://59d39900ebfb8.streamlock.net/rcv/rcv/playlist.m3u8
 #EXTINF:-1 tvg-id="SanIgnacioTV.hn",San Ignacio TV (720p)
 https://amixtv.live:3753/live/sitvlive.m3u8
@@ -117,7 +117,7 @@ https://stream.oursnetworktv.com/latin/telaVision/playlist.m3u8
 https://astra.teleceiba.com:8443/play/a004/index.m3u8
 #EXTINF:-1 tvg-id="TeleDanli.hn",TeleDanlí Canal 9 (720p) [Not 24/7]
 https://cloud2.streaminglivehd.com:1936/8224/8224/playlist.m3u8
-#EXTINF:-1 tvg-id="",Telemás (720p)
+#EXTINF:-1 tvg-id="Telemas.hn",Telemás (720p)
 https://viewhn.com/telemas/live/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleProgreso.hn",TeleProgreso (720p)
 https://livestreamhd.us:8077/teleprogreso/live/playlist.m3u8
@@ -142,13 +142,13 @@ https://s.emisoras.tv:8081/tvcopan/index.m3u8
 #EXTINF:-1 tvg-id="TVEstrella.hn",TV Estrella (720p)
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_ab3fd7a07fff11eea3d485758bf6a333
 https://stream.castr.com/6540085553d46d4f7a2ec2e5/live_ab3fd7a07fff11eea3d485758bf6a333/index.fmp4.m3u8
-#EXTINF:-1 tvg-id="",TV MÁS HD (720p)
+#EXTINF:-1 tvg-id="TVMASHD.hn",TV MÁS HD (720p)
 https://s1.tvdatta.com:3991/live/tvmashdlive.m3u8
 #EXTINF:-1 tvg-id="UNAHUTV.hn",UNAH UTV (360p) [Not 24/7]
 https://live-utv.unah.edu.hn/web/salida.m3u8
 #EXTINF:-1 tvg-id="UNETV.hn",UNE TV (720p) [Not 24/7]
 https://amixtv.live:3395/live/unetvlive.m3u8
-#EXTINF:-1 tvg-id="",Vallevisión (720p)
+#EXTINF:-1 tvg-id="Vallevision.hn",Vallevisión (720p)
 https://mediacp.us:8081/vallevision/index.m3u8
 #EXTINF:-1 tvg-id="VTV.hn",VTV (480p) [Not 24/7]
 https://d1af06j591gh9u.cloudfront.net/VTVHN/e395935fa39597e3997b916a295f23e4.sdp/playlist.m3u8
diff --git a/streams/id.m3u b/streams/id.m3u
index ea501826c..d074ce1ea 100644
--- a/streams/id.m3u
+++ b/streams/id.m3u
@@ -15,7 +15,7 @@ https://ams.juraganstreaming.com:5443/LiveApp/streams/arektv.m3u8
 https://wowza.convergen.co/atvli/atvli.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="BaliTV.id",Bali TV (720p) [Geo-blocked]
 https://cdn-telkomsel-01.akamaized.net/Content/HLS/Live/channel(8e867ae0-b2c0-4968-9f60-a11aee8c0987)/index.m3u8
-#EXTINF:-1 tvg-id="",Balikpapan TV (720p)
+#EXTINF:-1 tvg-id="BalikpapanTV.id",Balikpapan TV (720p)
 https://5bf7b725107e5.streamlock.net/btv/btv/playlist.m3u8
 #EXTINF:-1 tvg-id="BandungTV.id",Bandung TV (360p)
 http://202.150.153.254:65500/bandungtvWEBSITE.m3u8
@@ -87,7 +87,7 @@ http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch375)/index.m3u
 https://v3.siar.us/humabetangtv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IAmChannel.id",I AM CHANNEL (576p) [Not 24/7]
 http://iamchannel.org:1935/tes/1/playlist.m3u8
-#EXTINF:-1 tvg-id="",iBerkah (1080p)
+#EXTINF:-1 tvg-id="iBerkah.id",iBerkah (1080p)
 https://play.accolamedia.id/accola/iberkah.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="IDTV.id",IDTV (720p) [Not 24/7]
 https://b1world.beritasatumedia.com/Beritasatu/B1World_manifest.m3u8
@@ -115,7 +115,7 @@ http://103.255.15.222:1935/tv/jitv_720p/playlist.m3u8
 https://stream.jogjatv.co.id/jtvlive/stream/index.m3u8
 #EXTINF:-1 tvg-id="JTV.id",JTV (720p) [Not 24/7] [Geo-blocked]
 http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch17)/index.m3u8
-#EXTINF:-1 tvg-id="",Kilisuci TV
+#EXTINF:-1 tvg-id="KilisuciTV.id",Kilisuci TV
 https://5bf7b725107e5.streamlock.net/kstv/kstv/playlist.m3u8
 #EXTINF:-1 tvg-id="LingkarTV.id",Lingkar TV
 https://lingkartv.my.id/hls/lingkartv.m3u8
@@ -161,7 +161,7 @@ http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch309)/index.m3u
 http://122.248.43.138:1935/ch15/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="PONTV.id",Pon TV (360p) [Not 24/7]
 https://v3.siar.us/pontianaktelevisi/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",PSJ TV (1080p)
+#EXTINF:-1 tvg-id="PSJTV.id",PSJ TV (1080p)
 https://play.accolamedia.id/accola/psj.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="PujaTVAceh.id",Puja TV Aceh (1080p) [Not 24/7]
 https://v6.siar.us/pujatv/live/chunks.m3u8
@@ -195,10 +195,6 @@ http://116.254.112.74/hls/cakralive.m3u8
 http://122.248.43.138:1935/ch4/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="SMTV.id",SMTV (720p) [Not 24/7]
 http://122.248.43.138:1935/ch25/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="",SPOTV 2 (Indonesia)
-https://cdn09jtedge.indihometv.com/joss/133/beib2/index.m3u8
-#EXTINF:-1 tvg-id="",SPOTV (Indonesia)
-https://cdn09jtedge.indihometv.com/joss/133/beib1/index.m3u8
 #EXTINF:-1 tvg-id="TATV.id",TATV (720p) [Not 24/7]
 https://v2.siar.us/tatv/live.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TawafTV.id",Tawaf TV (720p)
@@ -353,3 +349,7 @@ https://cdn.gunadarma.ac.id/streams/ugtv/ingestugtv.m3u8
 https://ams.juraganstreaming.com:5443/LiveApp/streams/wesaltv.m3u8
 #EXTINF:-1 tvg-id="ZeeBioskop.id",Zee Bioskop (360p) [Geo-blocked]
 http://vod.linknetott.swiftcontent.com/Content/HLS/Live/Channel(ch161)/index.m3u8
+#EXTINF:-1 tvg-id="SPOTV.id",SPOTV (Indonesia)
+https://cdn09jtedge.indihometv.com/joss/133/beib1/index.m3u8
+#EXTINF:-1 tvg-id="SPOTV2.id",SPOTV 2 (Indonesia)
+https://cdn09jtedge.indihometv.com/joss/133/beib2/index.m3u8
diff --git a/streams/ie_samsung.m3u b/streams/ie_samsung.m3u
index 1a291e5c6..11a54d6fa 100644
--- a/streams/ie_samsung.m3u
+++ b/streams/ie_samsung.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",AfricaNews English (720p)
+#EXTINF:-1 tvg-id="AfricanewsEnglish.fr",AfricaNews English (720p)
 https://rakuten-africanews-1-ie.samsung.wurl.tv/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="AFVFamily.us",AFV Family
 https://futuretoday-afv-family-2-ie.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/il.m3u b/streams/il.m3u
index 172d25ca1..c35de7614 100644
--- a/streams/il.m3u
+++ b/streams/il.m3u
@@ -17,7 +17,7 @@ https://bcovlive-a.akamaihd.net/95116e8d79524d87bf3ac20ba04241e3/eu-central-1/53
 https://bcovlive-a.akamaihd.net/ecf224f43f3b43e69471a7b626481af0/eu-central-1/5377161796001/playlist.m3u8
 #EXTINF:-1 tvg-id="i24NEWSFrench.il",I24 News French (720p)
 https://bcovlive-a.akamaihd.net/41814196d97e433fb401c5e632d985e9/eu-central-1/5377161796001/playlist.m3u8
-#EXTINF:-1 tvg-id="",I24 News Hebrew (720p)
+#EXTINF:-1 tvg-id="i24NEWSHebrew.il",I24 News Hebrew (720p)
 https://bcovlive-a.akamaihd.net/d89ede8094c741b7924120b27764153c/eu-central-1/5377161796001/playlist.m3u8
 #EXTINF:-1 tvg-id="IsraelParsTV.il",Israel Pars TV (540p)
 https://live.pars-israel.com/iptv/stream.m3u8
@@ -41,7 +41,7 @@ http://wowza.media-line.co.il/Musayof-Live/livestream.sdp/playlist.m3u8
 https://now14.g-mana.live/media/91517161-44ab-4e46-af70-e9fe26117d2e/mainManifest.m3u8
 #EXTINF:-1 tvg-id="RanTVIsrael.il",Ran TV Israel (720p)
 https://streaminglive.co.il:3730/live/raniamranilive.m3u8
-#EXTINF:-1 tvg-id="",Relevant TV (1080p)
+#EXTINF:-1 tvg-id="RelevantTV.il",Relevant TV (1080p)
 https://6180c994cb835402.mediapackage.eu-west-1.amazonaws.com/out/v1/f1339272dd24416ca60b00e69075d783/index.m3u8
 #EXTINF:-1 tvg-id="Channel13.il",Reshet 13 (1080p)
 https://d18b0e6mopany4.cloudfront.net/out/v1/08bc71cf0a0f4712b6b03c732b0e6d25/index.m3u8
diff --git a/streams/in.m3u b/streams/in.m3u
index 4b86b831a..1da49fa70 100644
--- a/streams/in.m3u
+++ b/streams/in.m3u
@@ -22,7 +22,7 @@ https://aasthaott.akamaized.net/110923/smil:aasthatv.smil/chunklist_b1328000.m3u
 #EXTINF:-1 tvg-id="AasthaBhajan.in",Aastha Bhajan (480p)
 #EXTVLCOPT:http-referrer=Aasthatv.in
 https://aasthaott.akamaized.net/110923/smil:bhajan.smil/chunklist_b264000.m3u8
-#EXTINF:-1 tvg-id="",Aathavan TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AathavanTV.uk",Aathavan TV (720p) [Not 24/7]
 http://45.77.66.224:1935/athavantv/live/playlist.m3u8
 #EXTINF:-1 tvg-id="ABPGanga.in",ABP Ganga (1080p)
 https://abplivetv.akamaized.net/hls/live/2043013/ganga/master.m3u8
@@ -66,7 +66,7 @@ https://cdn3.wowza.com/5/TDJ0aWNkNXFxWWta/angeltvcloud/ngrp:angelspanish_all/pla
 https://anjantvevent.pc.cdn.bitgravity.com/anjantv/live/amlst:event_anjan_,b400,b800,b1024,b1200,b1500,b4000,.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="APN.in",APN (576p)
 https://cdn.smartstream.video/smartstream-us/apnnews/apnnews/chunks.m3u8
-#EXTINF:-1 tvg-id="",Apna Punjab TV (720p)
+#EXTINF:-1 tvg-id="ApnaPunjabTV.ca",Apna Punjab TV (720p)
 https://plus.gigabitcdn.net/live-stream/apna-punjab-H3sE/playlist.m3u8
 #EXTINF:-1 tvg-id="ArgusNews.in",Argus News (1080p)
 https://live.argusnews.in/hls/argustv.m3u8
@@ -120,22 +120,10 @@ http://cdn19.live247stream.com/channely/tv/playlist.m3u8
 https://cnbcbazar-lh.akamaihd.net/i/cnbcbajar_1@178933/index_5_av-p.m3u8
 #EXTINF:-1 tvg-id="CNNNews18.in",CNN News 18
 https://n18syndication.akamaized.net/bpk-tv/CNN_News18_NW18_MOB/output01/index.m3u8
-#EXTINF:-1 tvg-id="DDAssam.in",DD Assam
-https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/2192ea99-acab-475f-9761-615270547cd8/2.m3u8
-#EXTINF:-1 tvg-id="DDJharkhand.in",DD Jharkhand
-https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/2c6c5c20-6afe-47c4-934f-a0d7002cb151/2.m3u8
 #EXTINF:-1 tvg-id="DDManipur.in",DD Manipur
 https://ddmanipur.org/hls/stream1.m3u8
-#EXTINF:-1 tvg-id="DDMeghalaya.in",DD Meghalaya
-https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/dafc23f6-c3d9-44d7-8d31-27aa80efe0b7/2.m3u8
-#EXTINF:-1 tvg-id="DDMizoram.in",DD Mizoram
-https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/5f0e3651-3393-41d2-a137-a4513be8f3d5/2.m3u8
 #EXTINF:-1 tvg-id="DDNews.in",DD News (1080p)
 https://hls.media.nic.in/hls/live/ddnews/ddnews.m3u8
-#EXTINF:-1 tvg-id="DDOdia.in",DD Odia
-https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/245d9a9e-4820-43b1-af33-4a3017d09f52/2.m3u8
-#EXTINF:-1 tvg-id="DDPunjabi.in",DD Punjabi
-https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/20c8ad14-a158-4a42-8889-e032d070856e/2.m3u8
 #EXTINF:-1 tvg-id="DesiChannel.in",Desi Channel (720p)
 https://live.wmncdn.net/desichannel/7e2dd0aed46b70a5c77f4affdb702e4b.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Dhamaal.in",Dhamaal (1080p) [Not 24/7]
@@ -541,7 +529,7 @@ http://131.153.22.8:1935/SWANTHAM/live/playlist.m3u8
 https://live.wmncdn.net/highnews/swaraj.stream/index.m3u8
 #EXTINF:-1 tvg-id="TaazaTV.in",Taaza TV (1080p)
 https://stream.playbox.co.in:19360/taaza/taaza.m3u8
-#EXTINF:-1 tvg-id="",Thanthi One (1080p)
+#EXTINF:-1 tvg-id="ThanthiOne.in",Thanthi One (1080p)
 https://249553662f3e.ap-south-1.playback.live-video.net/api/video/v1/ap-south-1.588204940461.channel.Sx8XPoik8VX2.m3u8
 #EXTINF:-1 tvg-id="ThanthiTV.in",Thanthi TV (396p)
 https://segment.yuppcdn.net/110322/thanthi/110322/thanthi_1800/playlist.m3u8
@@ -559,7 +547,7 @@ http://210.210.155.37/x6bnqe/s/s81/01.m3u8
 http://210.210.155.37/x6bnqe/s/s81/02.m3u8
 #EXTINF:-1 tvg-id="TotalBhakti.in",Total Bhakti (1080p)
 https://d34z4embz0hjf6.cloudfront.net/out/v1/d55b3323a9f142638f897378f0b526fe/index.m3u8
-#EXTINF:-1 tvg-id="",Travelxp Netherlands
+#EXTINF:-1 tvg-id="TravelxpNetherlands.in",Travelxp Netherlands
 https://travelxp-travelxp-3-nl.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="TribeTV.in",Tribe TV (720p)
 https://server.livelegitpro.in:9899/tribetv/tribetv/index.m3u8
@@ -658,3 +646,15 @@ https://livetv-channels.b-cdn.net/8076/playlist.m3u8
 http://183.89.246.119:8881/play/a09a/index.m3u8
 #EXTINF:-1 tvg-id="Zoom.in",Zoom (1080p)
 http://103.81.104.118/hls/stream8.m3u8
+#EXTINF:-1 tvg-id="DDMeghalaya.in",DD Meghalaya
+https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/dafc23f6-c3d9-44d7-8d31-27aa80efe0b7/2.m3u8
+#EXTINF:-1 tvg-id="DDPunjabi.in",DD Punjabi
+https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/20c8ad14-a158-4a42-8889-e032d070856e/2.m3u8
+#EXTINF:-1 tvg-id="DDOdia.in",DD Odia
+https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/245d9a9e-4820-43b1-af33-4a3017d09f52/2.m3u8
+#EXTINF:-1 tvg-id="DDMizoram.in",DD Mizoram
+https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/5f0e3651-3393-41d2-a137-a4513be8f3d5/2.m3u8
+#EXTINF:-1 tvg-id="DDJharkhand.in",DD Jharkhand
+https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/2c6c5c20-6afe-47c4-934f-a0d7002cb151/2.m3u8
+#EXTINF:-1 tvg-id="DDAssam.in",DD Assam
+https://d3eyhgoylams0m.cloudfront.net/v1/manifest/93ce20f0f52760bf38be911ff4c91ed02aa2fd92/ed7bd2c7-8d10-4051-b397-2f6b90f99acb/2192ea99-acab-475f-9761-615270547cd8/2.m3u8
diff --git a/streams/iq.m3u b/streams/iq.m3u
index 277f2b519..cfbb156db 100644
--- a/streams/iq.m3u
+++ b/streams/iq.m3u
@@ -29,7 +29,7 @@ http://63b03f7689049.streamlock.net:1935/live/3/playlist.m3u8
 https://206222.global.ssl.fastly.net/65045e4aba85cfe0025e4a60/live_c6c4040053cd11ee95b47153d2861736/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="AlRabiaaTV.iq",Al Rabiaa TV (1080p)
 https://206222.global.ssl.fastly.net/65045e4aba85cfe0025e4a60/live_c6c4040053cd11ee95b47153d2861736/index.m3u8
-#EXTINF:-1 tvg-id="",Al Rafidain (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlRafidainTV.tr",Al Rafidain (720p) [Not 24/7]
 https://cdg8.edge.technocdn.com/arrafidaintv/source/playlist.m3u8
 #EXTINF:-1 tvg-id="AlRasheedTV.iq",Al Rasheed (1080p) [Not 24/7]
 https://media1.livaat.com/static/AL-RASHEED-HD/playlist.m3u8
@@ -41,7 +41,7 @@ https://nl2.livekadeh.com/hls2/alnaeem.m3u8
 https://5d94523502c2d.streamlock.net/home/mystream/playlist.m3u8
 #EXTINF:-1 tvg-id="AlSharqiyaNews.iq",Al-Sharqiya News (1080p)
 https://5d94523502c2d.streamlock.net/alsharqiyalive/mystream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Alawla TV (720p)
+#EXTINF:-1 tvg-id="AlawlaTV.iq",Alawla TV (720p)
 https://63b03f7689049.streamlock.net/live/1tv/playlist.m3u8
 #EXTINF:-1 tvg-id="AlForatTV.iq",Alforat TV (1080p)
 http://95.216.180.111:1935/live/10/playlist.m3u8
@@ -59,9 +59,9 @@ http://63b03f7689049.streamlock.net:1935/live/16/playlist.m3u8
 http://77.36.160.164:1935/live4/thaghalayn/playlist.m3u8
 #EXTINF:-1 tvg-id="AmozhgaryTV.iq",Amozhgary TV (1080p)
 https://media.streambrothers.com:1936/8248/8248/playlist.m3u8
-#EXTINF:-1 tvg-id="",Assyrian ANB (720p)
+#EXTINF:-1 tvg-id="AssyrianANB.us",Assyrian ANB (720p)
 https://anbsat.ddns.net/anb/live/ANB/playlist.m3u8
-#EXTINF:-1 tvg-id="",Ava TV (1080p)
+#EXTINF:-1 tvg-id="AvaTV.ca",Ava TV (1080p)
 https://cdn3.wowza.com/1/OWNQVXVWc0dQclJz/RXJPdHJx/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="BayyinatTV.iq",Bayyinat TV (404p)
 https://nl2.livekadeh.com/hls2/Bayyinat.m3u8
@@ -69,7 +69,7 @@ https://nl2.livekadeh.com/hls2/Bayyinat.m3u8
 https://live.beitolabbas.tv/live/beitolabbastv.m3u8
 #EXTINF:-1 tvg-id="BeladiSatelliteTV.iq",Beladi Satellite TV (540p)
 http://95.216.180.111:1935/live/68/playlist.m3u8
-#EXTINF:-1 tvg-id="",Channel 8 Kurdish (720p)
+#EXTINF:-1 tvg-id="Channel8.iq",Channel 8 Kurdish (720p)
 https://live.channel8.com/Channel8-Kurdish/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="DijlahTarab.iq",Dijlah Tarab (1080p)
 https://ghaasiflu.online/tarab/index.m3u8
@@ -151,5 +151,5 @@ https://mn-nl.mncdn.com/utviraqi2/64c80359/index.m3u8
 https://ca-rt.onetv.app/Waar/index-0.m3u8
 #EXTINF:-1 tvg-id="ZagrosTV.iq",Zagros (720p) [Not 24/7]
 https://5a3ed7a72ed4b.streamlock.net/zagrostv/SMIL:myStream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Zarok TV Sorani (720p)
+#EXTINF:-1 tvg-id="ZarokTV.iq",Zarok TV Sorani (720p)
 https://zindisorani.zaroktv.com.tr/hls/stream.m3u8
diff --git a/streams/ir.m3u b/streams/ir.m3u
index 3eaa333ed..b75396bca 100644
--- a/streams/ir.m3u
+++ b/streams/ir.m3u
@@ -37,7 +37,7 @@ https://cdnlive.presstv.ir/ifilmlive/smil:ifilmar.smil/playlist.m3u8
 https://cdnlive.presstv.ir/ifilmlive/smil:ifilmen.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="iFilmPersian.ir",iFilm Persian
 https://cdnlive.presstv.ir/ifilmlive/smil:ifilmfa.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Iran Jewish TV (720p)
+#EXTINF:-1 tvg-id="IranJewishTV.ir",Iran Jewish TV (720p)
 http://iran620.com:1935/live/IranJewishTv/playlist.m3u8
 #EXTINF:-1 tvg-id="IranPress.ir",Iran Press (480p) [Not 24/7]
 https://ip2stream.iranpress.com/hls/ip2.m3u8
diff --git a/streams/it.m3u b/streams/it.m3u
index 367051542..51ce9d40e 100644
--- a/streams/it.m3u
+++ b/streams/it.m3u
@@ -13,7 +13,7 @@ https://59d7d6f47d7fc.streamlock.net/canale51/canale51/playlist.m3u8
 https://585b674743bbb.streamlock.net/9050/9050/playlist.m3u8
 #EXTINF:-1 tvg-id="111TV.it",111 TV (720p)
 https://5db313b643fd8.streamlock.net/111TV/111TV/playlist.m3u8
-#EXTINF:-1 tvg-id="",A2i TV (1080p)
+#EXTINF:-1 tvg-id="A2iTV.it",A2i TV (1080p)
 https://stream.sen-gt.com/A2itv/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="ABChannel.it",AB Channel (720p)
 https://tsw.streamingwebtv24.it:1936/abchanneltv/abchanneltv/playlist.m3u8
@@ -113,7 +113,7 @@ https://5cbd3bc28341f.streamlock.net:444/fanotv_live/_definst_/43DA-3923-9C72-4E
 https://stream2.xdevel.com/video0s975817-1183/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="GiornaleRadioTV.it",Giornale Radio TV (720p)
 https://5f204aff97bee.streamlock.net/GR_tv/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Giovanni Paolo TV (1080p)
+#EXTINF:-1 tvg-id="GiovanniPaoloTV.it",Giovanni Paolo TV (1080p)
 https://media2021.rtvweb.com/giovannipaolotv/web/playlist.m3u8
 #EXTINF:-1 tvg-id="GM24.it",GM24 (480p)
 https://streaming.softwarecreation.it/GM24/GM24/playlist.m3u8
@@ -179,7 +179,7 @@ https://d15umi5iaezxgx.cloudfront.net/LA7D/CLN/HLS-B/Live.m3u8
 https://f5842579ff984c1c98d63b8d789673eb.msvdn.net/live/S47282891/JWjL3xqPf4bX/playlist.m3u8
 #EXTINF:-1 tvg-id="LaTR3Marsala.it",La TR3 Marsala (720p)
 https://tsw.streamingwebtv24.it:1936/eslife1/eslife1/playlist.m3u8
-#EXTINF:-1 tvg-id="",LaC News 24 (720p)
+#EXTINF:-1 tvg-id="LaCNews24.it",LaC News 24 (720p)
 https://f5842579ff984c1c98d63b8d789673eb.msvdn.net/live/S27391994/HVvPMzy/playlist.m3u8
 #EXTINF:-1 tvg-id="LazioTV.it",Lazio TV (576p)
 http://151.0.207.99:1935/live/LAZIOTV12/playlist.m3u8
@@ -201,7 +201,7 @@ http://wms.shared.streamshow.it/lucaniatv/lucaniatv/playlist.m3u8
 https://4c4b867c89244861ac216426883d1ad0.msvdn.net/live/S62628868/uhdWBlkC1AoO/playlist.m3u8
 #EXTINF:-1 tvg-id="MadeinBOTV.it",MadeinBO TV (1080p)
 https://srvx1.selftv.video/dmchannel/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Maria Vision (1080p)
+#EXTINF:-1 tvg-id="MariaVisionItalia.it",Maria Vision (1080p)
 https://1601580044.rsc.cdn77.org/live/_jcn_/amlst:CHANNEL_2/playlist.m3u8
 #EXTINF:-1 tvg-id="MediaTV.it",Media TV (288p)
 http://live.sloode.com:1935/mediatv/live/playlist.m3u8
@@ -211,7 +211,7 @@ https://live3-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(kq)/
 https://live2.msf.cdn.mediaset.net/content/hls_h0_clr_vos/live/channel(i2)/index.m3u8
 #EXTINF:-1 tvg-id="MediterraniaTV.it",MediterraniaTV (1080p)
 https://59bb40cf810aa.streamlock.net:4443/streamingvincente/streamingvincente/playlist.m3u8
-#EXTINF:-1 tvg-id="",Medjugorje Italia TV (480p)
+#EXTINF:-1 tvg-id="MedjugorjeItaliaTV.it",Medjugorje Italia TV (480p)
 https://5f22d76e220e1.streamlock.net/medjugorjeitaliatv/medjugorjeitaliatv/playlist.m3u8
 #EXTINF:-1 tvg-id="MinformoTV.it",Minformo TV (720p)
 https://5db313b643fd8.streamlock.net/MinformoTV/MinformoTV/playlist.m3u8
@@ -245,13 +245,13 @@ https://5db313b643fd8.streamlock.net/Paroledivita/Paroledivita/playlist.m3u8
 https://streamlive.arcapuglia.it:8080/live/partenope/index.m3u8
 #EXTINF:-1 tvg-id="PassioneLotto.it",Passione Lotto (300p)
 http://185.63.52.103:8080/hls/passionelotto/1_2/index.m3u8
-#EXTINF:-1 tvg-id="",Peer TV Alto Adige (1280p)
+#EXTINF:-1 tvg-id="PeerTVAltoAdige.it",Peer TV Alto Adige (1280p)
 https://iptv.peer.biz/live/peertv-it.m3u8
-#EXTINF:-1 tvg-id="",Peer TV South Tyrol (1280p)
+#EXTINF:-1 tvg-id="PeerTVSouthTyrol.it",Peer TV South Tyrol (1280p)
 https://iptv.peer.biz/live/peertv-en.m3u8
-#EXTINF:-1 tvg-id="",Peer TV Südtirol (1080p)
+#EXTINF:-1 tvg-id="PeerTVSudtirol.it",Peer TV Südtirol (1080p)
 https://iptv.peer.biz/live/peertv.m3u8
-#EXTINF:-1 tvg-id="",Pluto TV Top Gear
+#EXTINF:-1 tvg-id="PlutoTVTopGear.it",Pluto TV Top Gear
 #EXTVLCOPT:http-referrer=https://pluto.tv/it/live-tv/64c109a4798def0008a6e03e
 https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/64c109a4798def0008a6e03e/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
 #EXTINF:-1 tvg-id="",POP Television (720p)
@@ -286,7 +286,7 @@ https://5929b138b139d.streamlock.net/RadioIbizaTV/livestream/playlist.m3u8
 http://wms.shared.streamshow.it/visualradio/mp4:visualradio/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioIglesiasSardegna.it",Radio Iglesias Sardegna (576p) [Geo-blocked]
 https://59d7d6f47d7fc.streamlock.net/visualradio/visualradio/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Italia Anni 60 TV (720p)
+#EXTINF:-1 tvg-id="RadioItaliaAnni60TV.it",Radio Italia Anni 60 TV (720p)
 https://tvd-ria60.fluid.stream/Anni60TV/livestream/playlist.m3u8
 #EXTINF:-1 tvg-id="RadioMonteCarloTV.it",Radio Montecarlo (576p)
 https://live3-radio-mediaset-it.akamaized.net/Content/hls_h0_clr_vos/live/channel(bb)/index.m3u8
@@ -522,7 +522,7 @@ https://live.mariatvcdn.com/telemistretta/8fbcd205ada81b295ee6c211c3a80dde.sdp/p
 http://185.202.128.1:1935/TelemoliseStream/telemoliseTV.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="teleMonteneve.it",teleMonteneve (480p) [Not 24/7]
 http://wms.shared.streamshow.it:1935/telemonteneve/telemonteneve/live.m3u8
-#EXTINF:-1 tvg-id="",Telenorba (1080p)
+#EXTINF:-1 tvg-id="Telenorba.it",Telenorba (1080p)
 http://stream2.xdevel.com/video2s976570-2303/stream/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="Telenord.it",Telenord (576p) [Not 24/7]
 https://5db313b643fd8.streamlock.net/Telenord/Telenord/playlist.m3u8
@@ -538,7 +538,7 @@ https://live.mariatvcdn.com/teleradiopace4/13d74f2cfe921bfbc262697203d47d8f.sdp/
 https://live.mariatvcdn.com/teleradiopace6/d289fe76f16ad32afec471ea1b941583.sdp/index.m3u8
 #EXTINF:-1 tvg-id="",Telepace Roma (720p)
 https://live.mariatvcdn.com/mariatvpoint/d36592901d5429dd7f9ec1e7bbeda8c2.sdp/index.m3u8
-#EXTINF:-1 tvg-id="",Telepace Trento (540p)
+#EXTINF:-1 tvg-id="TelepaceTrento.it",Telepace Trento (540p)
 https://5a1178b42cc03.streamlock.net/telepacetrento/telepacetrento/playlist.m3u8
 #EXTINF:-1 tvg-id="Telepavia.it",telePAVIA (720p)
 http://wms.shared.streamshow.it/telepavia/mp4:telepavia/playlist.m3u8
diff --git a/streams/jm.m3u b/streams/jm.m3u
index 07f559644..17aea4a50 100644
--- a/streams/jm.m3u
+++ b/streams/jm.m3u
@@ -1,16 +1,16 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="CaribbeanGospelTV.jm",Caribbean Gospel TV (1080p)
 https://5a1178b42cc03.streamlock.net/CGTV2024/CGTV2024/playlist.m3u8
-#EXTINF:-1 tvg-id="",Fame95 FM (480p)
+#EXTINF:-1 tvg-id="Fame95FM.jm",Fame95 FM (480p)
 https://rjr-fame.akamaized.net/hls/live/2033820/RJR_FAME/master.m3u8
 #EXTINF:-1 tvg-id="JamaicaOnlineTV.jm",Jamaica Online TV (1080p) [Not 24/7]
 https://tvsw7-hls.secdn.net/tvsw7-chorigin/play/prod-bb11dd0e11ca45229a3f58aeff5213d8/playlist.m3u8
-#EXTINF:-1 tvg-id="",Jamaica Travel Channel (720p)
+#EXTINF:-1 tvg-id="JamaicaTravelChannel.jm",Jamaica Travel Channel (720p)
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_2e935360c78c11eea7a2615e1a7388f3
 https://stream.castr.com/651b2d8bde8119abf5dabf19/live_2e935360c78c11eea7a2615e1a7388f3/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="MercyandTruthMinistriesTelevision.jm",MTM TV (720p)
 https://angel.btbn.tv:5443/mtmtv/streams/live.m3u8
 #EXTINF:-1 tvg-id="TVJ.jm",TVJ (720p)
 https://rjr-tvj-geo.akamaized.net/hls/live/2041530/TVJ_GEO/1/streamPlaylist.m3u8
-#EXTINF:-1 tvg-id="",WorlVybz TV (360p)
+#EXTINF:-1 tvg-id="WorldVybzTV.jm",WorlVybz TV (360p)
 https://tv.wowzahosting.com:3292/stream/play.m3u8
diff --git a/streams/jo.m3u b/streams/jo.m3u
index f38ae79ae..d82e0f844 100644
--- a/streams/jo.m3u
+++ b/streams/jo.m3u
@@ -1,13 +1,13 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AOneTV.jo",A One TV [Not 24/7]
 https://master.starmena-cloud.com/hls/a1jo.m3u8
-#EXTINF:-1 tvg-id="",Al Haqiqa (576p)
+#EXTINF:-1 tvg-id="AlHakikaTV.jo",Al Haqiqa (576p)
 https://jmc-live.ercdn.net/alhaqiqa/alhaqiqa.m3u8
 #EXTINF:-1 tvg-id="AlMamlakaTV.jo",Al Mamlaka TV (1080p)
 https://bcovlive-a.akamaihd.net/4109c7ba30fd4a44ad9afe917c67a8c8/eu-central-1/6415809151001/playlist.m3u8
 #EXTINF:-1 tvg-id="AlerthAlnabawiChannel.jo",Alerth Alnabawi Channel (576p)
 http://82.212.74.2:8000/live/7307.m3u8
-#EXTINF:-1 tvg-id="",Alhaqeqa Aldawlia (1080p)
+#EXTINF:-1 tvg-id="AlhaqeqaAldawlia.jo",Alhaqeqa Aldawlia (1080p)
 https://ghaasiflu.online/alhqeqa/index.m3u8
 #EXTINF:-1 tvg-id="AltaghierTV.jo",Altaghier TV (1080p)
 #EXTVLCOPT:http-referrer=https://player.castr.com/
diff --git a/streams/jp.m3u b/streams/jp.m3u
index a3bfefc9e..5c3adf575 100644
--- a/streams/jp.m3u
+++ b/streams/jp.m3u
@@ -27,7 +27,7 @@ https://nhkwlive-xjp.akamaized.net/hls/live/2003458/nhkwlive-xjp-en/index_1M.m3u
 https://cdn.nhkworld.jp/www11/nhkworld-tv/bmcc-live/fr/playlist.m3u8
 #EXTINF:-1 tvg-id="",NHK World News (Portuguese Subs) (720p)
 https://cdn.nhkworld.jp/www11/nhkworld-tv/bmcc-live/pt/playlist.m3u8
-#EXTINF:-1 tvg-id="",NHK World News (Spanish Subs) (720p)
+#EXTINF:-1 tvg-id="NHKWorldEspanol.jp",NHK World News (Spanish Subs) (720p)
 https://cdn.nhkworld.jp/www11/nhkworld-tv/bmcc-live/es/playlist.m3u8
 #EXTINF:-1 tvg-id="NHKWorldPremium.jp",NHK World Premium (720p) [Not 24/7]
 https://cdn.nhkworld.jp/www11/nhkworld-tv/pre/hlscomp.m3u8
diff --git a/streams/ke.m3u b/streams/ke.m3u
index 781a9bd22..c1e756e27 100644
--- a/streams/ke.m3u
+++ b/streams/ke.m3u
@@ -7,13 +7,13 @@ http://streamer02.nbo1.angani.co:1935/aviationtv/myStream/playlist.m3u8
 https://goliveafrica.media:9998/live/638da5440743c/index.m3u8
 #EXTINF:-1 tvg-id="CitizenExtra.ke",Citizen Extra (720p)
 https://74937.global.ssl.fastly.net/5ea49827ff3b5d7b22708777/live_40c5808063f711ec89a87b62db2ecab5/index.m3u8
-#EXTINF:-1 tvg-id="",Clergy TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ClergyTV.ke",Clergy TV (720p) [Not 24/7]
 https://goliveafrica.media:9998/live/650452cf2ddb2/index.m3u8
 #EXTINF:-1 tvg-id="CMTvKenya.ke",CMTv Kenya (576p) [Not 24/7]
 https://goliveafrica.media:9998/live/64ede813cfe1a/index.m3u8
 #EXTINF:-1 tvg-id="DestinyVoicesTV.ke",Destiny Voices TV (480p)
 https://apps.digitaltv.co.ke/live/2004.m3u8
-#EXTINF:-1 tvg-id="",EBN TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EBNTV.ke",EBN TV (720p) [Not 24/7]
 https://goliveafrica.media:9998/live/65d8475d1e6cb/index.m3u8
 #EXTINF:-1 tvg-id="ElevateTV.ke",Elevate TV (720p) [Not 24/7]
 https://goliveafrica.media:9998/live/64a98a7eac12a/index.m3u8
@@ -21,13 +21,13 @@ https://goliveafrica.media:9998/live/64a98a7eac12a/index.m3u8
 https://goliveafrica.media:9998/live/647460ac1ddd6/index.m3u8
 #EXTINF:-1 tvg-id="GTNTV.ke",GTN TV (1080p) [Not 24/7]
 https://goliveafrica.media:9998/live/644e07abdc1d3/index.m3u8
-#EXTINF:-1 tvg-id="",Heaven Bound TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="HeavenBoundTV.ke",Heaven Bound TV (480p) [Not 24/7]
 https://goliveafrica.media:9998/live/62580b337c021/index.m3u8
-#EXTINF:-1 tvg-id="",His Grace TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="HisGraceTV.ke",His Grace TV (480p) [Not 24/7]
 https://goliveafrica.media:9998/live/6593c35f9c090/index.m3u8
 #EXTINF:-1 tvg-id="HLCTV.ke",HLC TV (480p) [Not 24/7]
 https://goliveafrica.media:9998/live/627d06e001aaf/index.m3u8
-#EXTINF:-1 tvg-id="",ICTV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ICTV.ke",ICTV (480p) [Not 24/7]
 https://goliveafrica.media:9998/live/659a7f33bed3f/index.m3u8
 #EXTINF:-1 tvg-id="InooroTV.ke",Inooro TV (720p)
 https://74937-castr.akamaized.net/5ea49827ff3b5d7b22708777/live_cd93fa8063f411ecb28b5d4f40b51a46/index.m3u8
@@ -39,7 +39,7 @@ https://5de06ce62a0b5.streamlock.net/k24/myStream/playlist.m3u8
 https://goliveafrica.media:9998/live/62f643cdca8cf/index.m3u8
 #EXTINF:-1 tvg-id="LolweTV.ke",Lolwe TV (576p) [Not 24/7]
 https://goliveafrica.media:9998/live/62580e144eb43/index.m3u8
-#EXTINF:-1 tvg-id="",Luyaa TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="LuyaaTV.ke",Luyaa TV (480p) [Not 24/7]
 https://goliveafrica.media:9998/live/659e7c6432815/index.m3u8
 #EXTINF:-1 tvg-id="MasharikiTV.ke",Mashariki TV (720p) [Not 24/7]
 https://goliveafrica.media:9998/live/634adc0806f2b/index.m3u8
@@ -49,7 +49,7 @@ https://goliveafrica.media:9998/live/628e5c1991061/index.m3u8
 https://webstreaming.viewmedia.tv/web_026/Stream/playlist.m3u8
 #EXTINF:-1 tvg-id="MuthingiTV.ke",Muthingi TV (480p)
 https://apps.digitaltv.co.ke/live/2005.m3u8
-#EXTINF:-1 tvg-id="",Muugi TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="MuugiTV.ke",Muugi TV (480p) [Not 24/7]
 https://goliveafrica.media:9998/live/62b3ffb71a3d6/index.m3u8
 #EXTINF:-1 tvg-id="MwangazaTV.ke",Mwangaza TV (720p) [Not 24/7]
 https://goliveafrica.media:9998/live/6516be24a6bac/index.m3u8
@@ -67,7 +67,7 @@ https://goliveafrica.media:9998/live/64873b6222c93/index.m3u8
 https://citizentv.castr.com/5ea49827ff3b5d7b22708777/live_9b761ff063f511eca12909b8ef1524b4/index.m3u8
 #EXTINF:-1 tvg-id="SayareTV.ke",Sayare TV (720p) [Not 24/7]
 https://goliveafrica.media:9998/live/636dedfa327d7/index.m3u8
-#EXTINF:-1 tvg-id="",SOA TV (720p)
+#EXTINF:-1 tvg-id="SOATV.ke",SOA TV (720p)
 https://goliveafrica.media:9998/live/6268e317152cc/index.m3u8
 #EXTINF:-1 tvg-id="UrejeshoTVAfrica.ke",Urejesho TV Africa (360p) [Not 24/7]
 https://goliveafrica.media:9998/live/64a26e4dd21a3/index.m3u8
diff --git a/streams/kg.m3u b/streams/kg.m3u
index 73897d71c..952aeb4a2 100644
--- a/streams/kg.m3u
+++ b/streams/kg.m3u
@@ -1,15 +1,15 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",312 Кино (406p)
+#EXTINF:-1 tvg-id="312Kino.kg",312 Кино (406p)
 http://176.126.166.43:1935/live/312kino/playlist.m3u8
-#EXTINF:-1 tvg-id="",312 ТВ (406p)
+#EXTINF:-1 tvg-id="312TV.kg",312 ТВ (406p)
 http://176.126.166.43:1935/live/312musik/playlist.m3u8
 #EXTINF:-1 tvg-id="NextTV.kg",Next TV (1080p) [Not 24/7]
 http://gohoski.fvds.ru:3000/mediabay/601/playlist.m3u8
 #EXTINF:-1 tvg-id="TV1KG.kg",TV1 KG (1080p)
 http://212.2.225.30:1935/live/site.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV15 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="TV15.kg",TV15 (1080p) [Not 24/7]
 http://gohoski.fvds.ru:3000/mediabay/655/playlist.m3u8
-#EXTINF:-1 tvg-id="",Ош Пирим (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="OshPirim.kg",Ош Пирим (1080p) [Not 24/7]
 http://gohoski.fvds.ru:3000/mediabay/697/playlist.m3u8
 #EXTINF:-1 tvg-id="UTRK.kg",УТРК (480p) [Not 24/7]
 https://st2.mediabay.tv/KG_KTRK-UTRK/index.m3u8
diff --git a/streams/kh.m3u b/streams/kh.m3u
index 91d0d7587..97b7a7873 100644
--- a/streams/kh.m3u
+++ b/streams/kh.m3u
@@ -15,8 +15,6 @@ http://clive.malisresidences.com:1935/hm_hdtv/_definst_/smil:HMHDTV.smil/playlis
 http://124.248.165.18:1935/live/myStream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="",Netlink TV (720p)
 https://netlink.netlinkbroadcaster.com/hls/test.m3u8
-#EXTINF:-1 tvg-id="NTV.kh",NTV
-http://43.252.18.195:5080/LiveApp/streams/ntvhd.m3u8
 #EXTINF:-1 tvg-id="PNN.kh",PNN (720p)
 https://live.kh.malimarcdn.com/live/pnntvhd.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="RasmeyHangMeasHDTV.kh",Rasmey Hang Meas HDTV (720p)
@@ -25,14 +23,10 @@ http://clive.malisresidences.com:1935/rhm_hdtv/_definst_/smil:RHMHDTV.smil/playl
 https://seatv.netlinkbroadcaster.com/hls/test.m3u8
 #EXTINF:-1 tvg-id="",SEATV-Radio (720p)
 https://fmseatv.netlinkbroadcaster.com/hls/test.m3u8
-#EXTINF:-1 tvg-id="TownTV.kh",Town TV
-https://live-evg13.tv360.metfone.com.kh/live/towntv.m3u8
 #EXTINF:-1 tvg-id="TownTV.kh",Town TV (720p)
 https://live.kh.malimarcdn.com/live/towntv.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TV3.kh",TV 3 (720p)
 https://edge6a.v2h-cdn.com/tv3cam/tv3cam.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia
-http://live.happywatch99.com/livehd14/77bbe9df6a93cf229cd40f1400af00fa.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia (720p)
 https://live-evg3.tv360.metfone.com.kh/live/tv5.m3u8
 #EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia (720p)
@@ -43,3 +37,9 @@ https://live.kh.malimarcdn.com/live/tvk.stream/playlist.m3u8
 https://live.kh.malimarcdn.com/live/tvk2.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="WikiTV.kh",WIKI TV (720p)
 https://stream.wikitv.asia/live/ngrp:myStream_all/playlist.m3u8
+#EXTINF:-1 tvg-id="TownTV.kh",Town TV
+https://live-evg13.tv360.metfone.com.kh/live/towntv.m3u8
+#EXTINF:-1 tvg-id="NTV.kh",NTV
+http://43.252.18.195:5080/LiveApp/streams/ntvhd.m3u8
+#EXTINF:-1 tvg-id="TV5Cambodia.kh",TV5 Cambodia
+http://live.happywatch99.com/livehd14/77bbe9df6a93cf229cd40f1400af00fa.sdp/playlist.m3u8
diff --git a/streams/kw.m3u b/streams/kw.m3u
index ec5472eb4..40ac32d05 100644
--- a/streams/kw.m3u
+++ b/streams/kw.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AlMaaliTV.kw",Al Maali TV (1080p)
 https://kali.vdopanel.com:3986/live/mbashalive.m3u8
-#EXTINF:-1 tvg-id="",Al Maaref (350p)
+#EXTINF:-1 tvg-id="AlMaarefTV.qa",Al Maaref (350p)
 https://5e74a9d684b2e.streamlock.net/liveTrans/ngrp:channel23_all/playlist.m3u8
 #EXTINF:-1 tvg-id="KTV1.kw",KTV 1 (1080p)
 https://kwtktv1ta.cdn.mangomolo.com/ktv1/smil:ktv1.stream.smil/chunklist.m3u8
diff --git a/streams/kz.m3u b/streams/kz.m3u
index 1d3947816..18ddc9eb5 100644
--- a/streams/kz.m3u
+++ b/streams/kz.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",24KZ (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",24KZ (720p) [Not 24/7]
 http://serv30.vintera.tv:8081/habar/habar24/playlist.m3u8
-#EXTINF:-1 tvg-id="",24KZ (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",24KZ (720p) [Not 24/7]
 https://live-24kz.cdnvideo.ru/24kz/24kz.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="AbaiTV.kz",Abai TV (720p)
 https://abaitv-stream.qazcdn.com/abaitv/abaitv/playlist.m3u8
diff --git a/streams/lb.m3u b/streams/lb.m3u
index d4356f13c..e0ba459e6 100644
--- a/streams/lb.m3u
+++ b/streams/lb.m3u
@@ -19,14 +19,14 @@ http://stream.spilebanon.com:1935/live/myStream/playlist.m3u8
 http://istream.binarywaves.com:8081/hls/arabica/playlist.m3u8
 #EXTINF:-1 tvg-id="CharityTV.lb",CharityTV (1080p) [Not 24/7]
 http://185.105.4.236:1935/live/ngrp:livestream_all/live.m3u8
-#EXTINF:-1 tvg-id="",Falestinona Channel (576p)
+#EXTINF:-1 tvg-id="FalestinonaChannel.lb",Falestinona Channel (576p)
 https://ffs3.gulfsat.com/Falestinona-TV/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="NabaaTV.lb",Nabaa TV (720p) [Not 24/7]
+https://655ca86f46b1f.streamlock.net/live/Nabaa/playlist.m3u8
+#EXTINF:-1 tvg-id="NabaaTV.lb",Nabaa TV (720p) [Not 24/7]
 http://31.14.40.237:1935/live/Nabaa/playlist.m3u8
 #EXTINF:-1 tvg-id="NabaaTV.lb",Nabaa TV (720p) [Not 24/7]
 https://5dc7d824154d0.streamlock.net/live/Nabaa/playlist.m3u8
-#EXTINF:-1 tvg-id="NabaaTV.lb",Nabaa TV (720p) [Not 24/7]
-https://655ca86f46b1f.streamlock.net/live/Nabaa/playlist.m3u8
 #EXTINF:-1 tvg-id="NBN.lb",NBN (720p)
 #EXTVLCOPT:http-referrer=https://odysee.com
 https://cloud.odysee.live/content/1d8edd84bd42e695555dbf20d83b45e203ed9ed0/master.m3u8
diff --git a/streams/lk.m3u b/streams/lk.m3u
index 2b61a8530..f6156064d 100644
--- a/streams/lk.m3u
+++ b/streams/lk.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="HiruTV.lk",Hiru TV (360p) [Not 24/7]
 https://tv.hiruhost.com:1936/8012/8012/playlist.m3u8
-#EXTINF:-1 tvg-id="",Imai TV (720p)
+#EXTINF:-1 tvg-id="ImaiTV.lk",Imai TV (720p)
 https://rpn3.bozztv.com/ssh101/ssh101/imaitv/playlist.m3u8
 #EXTINF:-1 tvg-id="ITN.lk",ITN (720p) [Not 24/7]
 https://j78dp2pnlq5r-hls-live.comcities.net/ITNDigital/cf467ddf13ba30dd3c71435cafa6fd6e.sdp/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="",Monara TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MonaraTV.lk",Monara TV (720p) [Not 24/7]
 https://jk3lz8xklw79-hls-live.5centscdn.com/lpl/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Rupavahini.lk",Rupavahini (480p)
 http://dammikartmp.tulix.tv/slrc1/slrc1/playlist.m3u8
diff --git a/streams/lu.m3u b/streams/lu.m3u
index b0bce985e..b384d987f 100644
--- a/streams/lu.m3u
+++ b/streams/lu.m3u
@@ -1,29 +1,29 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",apart TV (1080p)
+#EXTINF:-1 tvg-id="apartTV.lu",apart TV (1080p)
 https://2-fss-2.streamhoster.com/pl_124/206820-4338160-1/playlist.m3u8
 #EXTINF:-1 tvg-id="ChamberTV.lu",Chamber TV (1080p)
 https://media02.webtvlive.eu/chd-edge/smil:chamber_tv_hd.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Dudelange TV (720p)
+#EXTINF:-1 tvg-id="DudelangeTV.lu",Dudelange TV (720p)
 https://streamer20.multimedia.blue/Eltrona/DudelangeTV/playlist.m3u8
 #EXTINF:-1 tvg-id="eldoTV.lu",eldo.TV (1080p)
 https://eldo-streaming.eldo.lu/eldotv/smil:eldotv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Hesper TV (1080p)
+#EXTINF:-1 tvg-id="HesperTV.lu",Hesper TV (1080p)
 https://streamer20.multimedia.blue/Eltrona/HesperangeTV/playlist.m3u8
 #EXTINF:-1 tvg-id="LuxeTV.lu",Luxe TV (1080p)
 https://alchimie-luxe-fr-rakuten.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="LuxeTV.lu",Luxe TV (1080p)
 https://alchimie-luxe-uk-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Mamer TV (1080p)
+#EXTINF:-1 tvg-id="MamerTV.lu",Mamer TV (1080p)
 https://streamer20.multimedia.blue/Eltrona/MamerTV/playlist.m3u8
-#EXTINF:-1 tvg-id="",MierschTV (1080p)
+#EXTINF:-1 tvg-id="MierschTV.lu",MierschTV (1080p)
 https://streamer20.multimedia.blue/Eltrona/merschTV/playlist.m3u8
-#EXTINF:-1 tvg-id="",Pétange Info TV (720p)
+#EXTINF:-1 tvg-id="PetangeInfoTV.lu",Pétange Info TV (720p)
 https://streamer20.multimedia.blue/Eltrona/PetangeTV/playlist.m3u8
-#EXTINF:-1 tvg-id="",RTL Gold (1080p)
+#EXTINF:-1 tvg-id="RTLGold.lu",RTL Gold (1080p)
 https://stream.rtl.lu/data/live/tele/rtlgold/playlist.m3u8
-#EXTINF:-1 tvg-id="",RTL Radio Web TV (1080p)
+#EXTINF:-1 tvg-id="RTLWebRadioTV.lu",RTL Radio Web TV (1080p)
 https://rtlradio-streaming.rtl.lu/rtlradiowebtv/smil:rtlradiowebtv/playlist.m3u8
-#EXTINF:-1 tvg-id="",RTL Télé Lëtzebuerg (1080p)
+#EXTINF:-1 tvg-id="RTLTeleLetzebuerg.lu",RTL Télé Lëtzebuerg (1080p)
 https://live-edge.rtl.lu/channel1/smil:channel1/playlist.m3u8
 #EXTINF:-1 tvg-id="TodayRadio.lu",RTL Today Radio (720p)
 https://stream.rtl.lu/data/live/tele/rtltodayradio/playlist.m3u8
diff --git a/streams/lu_samsung.m3u b/streams/lu_samsung.m3u
index fc029b827..a023fff54 100644
--- a/streams/lu_samsung.m3u
+++ b/streams/lu_samsung.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",AfricaNews Français (720p)
+#EXTINF:-1 tvg-id="AfricanewsFrench.fr",AfricaNews Français (720p)
 https://rakuten-africanews-2-lu.samsung.wurl.tv/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1-lu.samsung.wurl.tv/manifest/playlist.m3u8
diff --git a/streams/lv.m3u b/streams/lv.m3u
index 422fda6d6..fe8680fb3 100644
--- a/streams/lv.m3u
+++ b/streams/lv.m3u
@@ -21,7 +21,7 @@ https://void.greenhosting.ru/MovifyKino_Mpeg4/index.m3u8
 https://void.greenhosting.ru/Multimania_Mpeg4/index.m3u8
 #EXTINF:-1 tvg-id="MuzikasVideoKanals.lv",Mūzikas Video Kanāls (720p)
 https://stream.onlive-media.com/live/streams/mvk.m3u8
-#EXTINF:-1 tvg-id="",Pingvīns (576p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Pingviins.lv",Pingvīns (576p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://void.greenhosting.ru/
 https://void.greenhosting.ru/PingvinsLV_Mpeg4/video.m3u8
 #EXTINF:-1 tvg-id="ReTV.lv",Re TV (1080p)
@@ -32,7 +32,7 @@ https://air.star.lv/TV_Jurmala_multistream/index.m3u8
 https://player.tvnet.lv/stream/amlst:61659/playlist.m3u8
 #EXTINF:-1 tvg-id="VidusdaugavasTelevizija.lv",Vidusdaugavas Televīzija (576p)
 https://straume.vdtv.lv/vdtv2/index.m3u8
-#EXTINF:-1 tvg-id="",Пингвин
+#EXTINF:-1 tvg-id="Pingviins.lv",Пингвин
 https://sirius.greenhosting.ru/PingvinRu/video.m3u8
 #EXTINF:-1 tvg-id="Gribuvisuzinat.lv",Хочу всё знать (576p)
 #EXTVLCOPT:http-referrer=https://void.greenhosting.ru/
diff --git a/streams/ly.m3u b/streams/ly.m3u
index ce4a8ac96..ec5310052 100644
--- a/streams/ly.m3u
+++ b/streams/ly.m3u
@@ -16,7 +16,7 @@ http://82.212.74.100:8000/live/8103.m3u8
 https://media1.livaat.com/Libyah-Mostaqbal/index.m3u8
 #EXTINF:-1 tvg-id="LibyasChannel.ly",Libya's Channel (480p)
 https://master.starmena-cloud.com/hls/libyas.m3u8
-#EXTINF:-1 tvg-id="",RTV Lebda (480p)
+#EXTINF:-1 tvg-id="RTVLebda.ly",RTV Lebda (480p)
 https://media1.livaat.com/live/Lebda_TV/index.m3u8
 #EXTINF:-1 tvg-id="SalamTV.ly",Salam TV (1080p)
 https://b01c02nl.mediatriple.net/videoonlylive/mtiwaxdzdfggbnlive/broadcast_5d1b0969c3188.smil/playlist.m3u8
diff --git a/streams/me.m3u b/streams/me.m3u
index c0c70ca84..c2b6589ea 100644
--- a/streams/me.m3u
+++ b/streams/me.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Radio televizija Rožaje (614p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadiotelevizijaRozaje.me",Radio televizija Rožaje (614p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/tvrozaje/index.m3u8
 #EXTINF:-1 tvg-id="TelevizijaTV7.me",Televizija TV7 (360p)
 http://uk4.streamingpulse.com:1935/tehnikatv777/tehnikatv777/playlist.m3u8
diff --git a/streams/mg.m3u b/streams/mg.m3u
index 00dd08e37..132cf2ac8 100644
--- a/streams/mg.m3u
+++ b/streams/mg.m3u
@@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",CBN+ (1080p)
+#EXTINF:-1 tvg-id="CBNPlus.mg",CBN+ (1080p)
 https://customer-gllhkkbamkskdl1p.cloudflarestream.com/eyJhbGciOiJSUzI1NiIsImtpZCI6ImI3YmIwODNmMDhkNmQ5NWExZjIzZWE3ZWRhOWY4NTZhIn0.eyJzdWIiOiJkZTY0M2RiYTQ0NmNhNGVlMTRlYTkwZTI1ZjY3YjliNCIsImtpZCI6ImI3YmIwODNmMDhkNmQ5NWExZjIzZWE3ZWRhOWY4NTZhIiwiZXhwIjoxNzMxOTA2OTk3LCJhY2Nlc3NSdWxlcyI6W3sidHlwZSI6ImlwLmdlb2lwLmNvdW50cnkiLCJhY3Rpb24iOiJibG9jayIsImNvdW50cnkiOlsiUlUiLCJCWSJdfV19.DMWkV9yOrk86uVF8BTXuO-RaVDzhILbpTr_5Q6_mfOTpCIVluK24KlrDvY30nmq_DAeKHWsSV4VgVcHsrp_Jre7QmZDRCqwSOhRrFQNdbKM3i20x09r3cVVfvcSCvsZ-dihLhhXHqHiBc0sgeamT2wEVAxEGXGXQX7jha-zHbes9XgwaQFNkRxgmSsXyHhcGUbtN_BKvHqA6lB5zyRIAIiQ9sxyxoMushpP29qz3U_rmDOF2yaEnnXbmv1nBx0c8TXBbcyM6z9rqTWppdA-qIedWTNPWgS5RXQ2LaYccdbfSHNTh1jlkgiMYyuin-MHJIZz8YDn_0HwmwlIStMlLRA/manifest/video.m3u8
diff --git a/streams/ml.m3u b/streams/ml.m3u
index c5e46925b..2afa717e2 100644
--- a/streams/ml.m3u
+++ b/streams/ml.m3u
@@ -3,7 +3,7 @@
 http://69.64.57.208/africable/playlist.m3u8
 #EXTINF:-1 tvg-id="CheriflaTV.ml",Cherifla TV (360p)
 http://69.64.57.208/cherifla/playlist.m3u8
-#EXTINF:-1 tvg-id="",D3 TV (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="D3TV.ml",D3 TV (540p) [Not 24/7]
 https://cageu.bozztv.com/ssh101/ssh101/d3tv1/playlist.m3u8
 #EXTINF:-1 tvg-id="ORTM1.ml",ORTM 1 (540p) [Not 24/7]
 http://69.64.57.208/ortm/playlist.m3u8
diff --git a/streams/mm.m3u b/streams/mm.m3u
index 06983d526..c9a6b8d7b 100644
--- a/streams/mm.m3u
+++ b/streams/mm.m3u
@@ -1,8 +1,6 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="5Plus.mm",5 Plus (480p)
 https://5a13fe32ef748.streamlock.net/mmplay/5plus/playlist.m3u8
-#EXTINF:-1 tvg-id="Channel7.mm",Channel 7 (720p)
-https://pplive.comquas.com:5443/LiveApp/streams/CLcBFN71NkF61709008601656.m3u8
 #EXTINF:-1 tvg-id="Channel7.mm",Channel 7 (480p)
 https://5a13fe32ef748.streamlock.net/mmplay/channel7/playlist.m3u8
 #EXTINF:-1 tvg-id="ChannelK.mm",Channel K (720p)
@@ -25,3 +23,5 @@ https://5a13fe32ef748.streamlock.net/mmplay/mrtv-4/playlist.m3u8
 https://5a13fe32ef748.streamlock.net/mmplay/mrtv-entertainment/playlist.m3u8
 #EXTINF:-1 tvg-id="MRTVParliament.mm",MRTV Parliament (480p)
 https://5a13fe32ef748.streamlock.net/mmplay/hluttaw/playlist.m3u8
+#EXTINF:-1 tvg-id="Channel7.mm",Channel 7 (720p)
+https://pplive.comquas.com:5443/LiveApp/streams/CLcBFN71NkF61709008601656.m3u8
diff --git a/streams/mq.m3u b/streams/mq.m3u
index 28d53386c..7d697998d 100644
--- a/streams/mq.m3u
+++ b/streams/mq.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",FUSION TV (1080p)
+#EXTINF:-1 tvg-id="FUSIONTV.mq",FUSION TV (1080p)
 https://edge20.vedge.infomaniak.com/livecast/ik:fusiontv/manifest.m3u8
-#EXTINF:-1 tvg-id="",Identité Télé Caraïbes (548p)
+#EXTINF:-1 tvg-id="IdentiteTeleCaraibes.mq",Identité Télé Caraïbes (548p)
 https://vdo2.pro-fhi.net:3769/stream/play.m3u8
 #EXTINF:-1 tvg-id="TVFamille.mq",TV Famille (720p)
 https://streamer1.streamhost.org/salive/GMItvfh/playlist.m3u8
diff --git a/streams/mv.m3u b/streams/mv.m3u
index 533c46dc4..ad064fdcf 100644
--- a/streams/mv.m3u
+++ b/streams/mv.m3u
@@ -1,17 +1,17 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="Channel13.mv",Channel 13 (720p) [Not 24/7]
 https://stream.theyraonline.com/live/channel13@live/index.m3u8
-#EXTINF:-1 tvg-id="",Maldives TV (608p)
+#EXTINF:-1 tvg-id="MaldivesTV.mv",Maldives TV (608p)
 https://live.maldivestv.mv/hls/stream/index.m3u8
-#EXTINF:-1 tvg-id="",Ocean TV Network (720p)
+#EXTINF:-1 tvg-id="OceanTVNetwork.mv",Ocean TV Network (720p)
 https://egress-stkplz7mbu4ftbof3zr94.live.streamer.wpstream.net/ev_wps_52076_oceant53da84_221_1717304220/hls/5yjq1wbd06ffe4t4.m3u8
 #EXTINF:-1 tvg-id="RaajjeTV.mv",Raajje TV (480p)
 https://stream.raajje.mv/live/rtv_live/index.m3u8
-#EXTINF:-1 tvg-id="",SSTV (1080p)
+#EXTINF:-1 tvg-id="SSTV.mv",SSTV (1080p)
 https://sstv.ssplay.mv/hls/sstv-live/index.m3u8
-#EXTINF:-1 tvg-id="TVMaldives.mv",TV Maldives
-https://customer-ujex1meek7koqd9x.cloudflarestream.com/9e93379c0d46ee588b99263d95bd9c42/manifest/video.m3u8
 #EXTINF:-1 tvg-id="VTV.mv",VTV (1080p) [Not 24/7]
 https://vtvstream.vnews.mv/vtvlive/vmedia/playlist.m3u8
+#EXTINF:-1 tvg-id="TVMaldives.mv",TV Maldives
+https://customer-ujex1meek7koqd9x.cloudflarestream.com/9e93379c0d46ee588b99263d95bd9c42/manifest/video.m3u8
 #EXTINF:-1 tvg-id="YES.mv",YES
 https://customer-ujex1meek7koqd9x.cloudflarestream.com/21262545317dadfa20dab4f9bd37c7c2/manifest/video.m3u8
diff --git a/streams/mw.m3u b/streams/mw.m3u
index f28176f0e..1d35c400c 100644
--- a/streams/mw.m3u
+++ b/streams/mw.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="MBC.mw",MBC (720p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/mbcmalawi/playlist.m3u8
-#EXTINF:-1 tvg-id="",MBC 2 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MBC2.mw",MBC 2 (720p) [Not 24/7]
 https://glb.bozztv.com/glb/ssh101/mbctv2mw/playlist.m3u8
 #EXTINF:-1 tvg-id="TimesTV.mw",Times TV (720p)
 https://live-par-2-abr-ln-cdn.livepush.io/live_abr_cdn/emDg2JTY15-px4dj/index.m3u8
diff --git a/streams/mx.m3u b/streams/mx.m3u
index 9c9b48d80..38009206a 100644
--- a/streams/mx.m3u
+++ b/streams/mx.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="8NTV.mx",8NTV (1080p)
 https://60417ddeaf0d9.streamlock.net/ntv/videontv/playlist.m3u8
-#EXTINF:-1 tvg-id="",12 Visión Encarnación (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="12VisionEncarnacion.mx",12 Visión Encarnación (1080p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder87b/playlist.m3u8
 #EXTINF:-1 tvg-id="XHSDDTDT.mx",15tv Sabinas (XHSDD-TDT) (360p)
 https://hls.gvstream.live/telesistemas/15tv.stream/playlist.m3u8
@@ -29,21 +29,21 @@ https://60ed5b6d0df78.streamlock.net:1936/envio2/envio2/playlist.m3u8
 https://linear-400.frequency.stream/mt/studio/400/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="bitMe.mx",bitMe (576p)
 https://linear-401.frequency.stream/mt/studio/401/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="",Cable Noticias Jalisco (614p) [Not 24/7]
+#EXTINF:-1 tvg-id="CableNoticiasJalisco.mx",Cable Noticias Jalisco (614p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder74/playlist.m3u8
-#EXTINF:-1 tvg-id="",California Medios TV (720p)
+#EXTINF:-1 tvg-id="CaliforniaMediosTV.mx",California Medios TV (720p)
 https://s5.mexside.net:1936/medios/medios/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 4 de Matehuala (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal4deMatehuala.mx",Canal 4 de Matehuala (360p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder203/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal5.mx",Canal 5
 http://181.78.105.146:2000/play/a038/index.m3u8
-#EXTINF:-1 tvg-id="",Canal 6 CDMX
+#EXTINF:-1 tvg-id="MultimediosCDMX.mx",Canal 6 CDMX
 https://stitcher-ipv4.pluto.tv/v1/stitch/embed/hls/channel/652e91fd6208700008dcaf7blivestitch/master.m3u8?advertisingId={PSID}&appVersion=unknown&deviceDNT={TARGETOPT}&deviceId={PSID}&deviceLat=0&deviceLon=0&deviceMake=samsung&deviceModel=samsung&deviceType=samsung-tvplus&deviceVersion=unknown&embedPartner=samsung-tvplus&profileFloor=&profileLimit=&profilesFromStream=true&samsung_app_domain={APP_DOMAIN}&samsung_app_name={APP_NAME}&us_privacy=1YNY
-#EXTINF:-1 tvg-id="",Canal 6 de Tamazula (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal6deTamazula.mx",Canal 6 de Tamazula (480p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder6/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal6Tecpan.mx",Canal 6 Tecpán (720p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder6tecpan/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 7 SLP (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal7SLP.mx",Canal 7 SLP (1080p) [Not 24/7]
 https://mvtvstream.com:444/live/6456eb2e56ab7/index.m3u8
 #EXTINF:-1 tvg-id="Canal10Cancun.mx",Canal 10 Cancún (720p) [Not 24/7]
 http://stream2.dynalias.com:1935/live/tvlive1/playlist.m3u8
@@ -59,7 +59,7 @@ https://dbdfj5y8nz2u4.cloudfront.net/c13bajio/d0dbe915091d400bd8ee7f27f0791303.s
 https://dbdfj5y8nz2u4.cloudfront.net/c13campeche/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal13Chiapas.mx",Canal 13 Chiapas (720p) [Not 24/7]
 https://dbdfj5y8nz2u4.cloudfront.net/c13chiapas/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 13 Guadalajara (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal13Guadalajara.mx",Canal 13 Guadalajara (720p) [Not 24/7]
 https://dbdfj5y8nz2u4.cloudfront.net/c13guadalajara/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal13Michoacan.mx",Canal 13 Michoacán (720p) [Not 24/7]
 https://dbdfj5y8nz2u4.cloudfront.net/c13michoacan/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
@@ -71,7 +71,7 @@ https://dbdfj5y8nz2u4.cloudfront.net/c13puebla/d0dbe915091d400bd8ee7f27f0791303.
 https://dbdfj5y8nz2u4.cloudfront.net/c13tabasco/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal13Tapachula.mx",Canal 13 Tapachula (720p) [Not 24/7]
 https://dbdfj5y8nz2u4.cloudfront.net/c13tapachula/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 13 Tierra Caliente (768p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal13TierraCaliente.mx",Canal 13 Tierra Caliente (768p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder30/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal13Yucatan.mx",Canal 13 Yucatán (720p) [Not 24/7]
 https://dbdfj5y8nz2u4.cloudfront.net/c13yucatan/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
@@ -81,7 +81,7 @@ https://live-ilce.ovp-vivaro.digital/ovp-origin-abr/ngrp:6359ef999f3fb_all/playl
 https://stream.oursnetworktv.com/latin/pueblamx/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal21Jalisco.mx",Canal 21 Jalisco (720p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder22/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 21 Rioverde (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal21Rioverde.mx",Canal 21 Rioverde (720p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder91/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal22Nacional.mx",Canal 22 Nacional (720p) [Geo-blocked]
 https://5fc584f3f19c9.streamlock.net/canal22/smil:canal22.smil/playlist.m3u8
@@ -90,7 +90,7 @@ https://60417ddeaf0d9.streamlock.net/telemetrika3/smil:telemetrika3.smil/playlis
 #EXTINF:-1 tvg-id="Canal28.mx",Canal 28 (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_bf24d4208d8611eeb116dbe87aa63be0
 https://stream.castr.com/653d77dcde70014f52ad1e19/live_bf24d4208d8611eeb116dbe87aa63be0/rewind-3600.m3u8
-#EXTINF:-1 tvg-id="",Canal 30 Cintalapa (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal30Cintalapa.mx",Canal 30 Cintalapa (720p) [Not 24/7]
 https://rpn3.bozztv.com/ssh101/ssh101/canal30mx/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal33Tijuana.mx",Canal 33 Tijuana (720p)
 https://5f2c1b0d880e5.streamlock.net/canal33tijuana/videocanal33tijuana/playlist.m3u8
@@ -115,7 +115,7 @@ https://edgeplay.canaldelcongreso.gob.mx/live_sd2/smil:canal-sd2.smil/playlist.m
 https://edgeplay.canaldelcongreso.gob.mx/live_hd1/smil:canal-hd1.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CanalOchoTV.mx",Canal Ocho TV (1080p)
 https://ssh101.bozztv.com/ssh101/ochotv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal Parlamento del Congreso de Jalisco (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CanalParlamentodelCongresodeJalisco.mx",Canal Parlamento del Congreso de Jalisco (720p) [Not 24/7]
 https://60417ddeaf0d9.streamlock.net/srtc/smil:srtc.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Capital21.mx",Capital 21 (1080p) [Not 24/7]
 https://streamingc21.cdmx.gob.mx/capital21/stream.m3u8
@@ -129,15 +129,15 @@ https://stream.oursnetworktv.com/latin/encoder29/playlist.m3u8
 https://linear-354.frequency.stream/mt/studio/354/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="DePeliculaPlus.mx",De Película Plus (576p)
 https://linear-404.frequency.stream/mt/studio/404/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="",Despierta TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="DespiertaTV.mx",Despierta TV (1080p) [Not 24/7]
 https://video2.lhdserver.es/despiertatv/live.m3u8
 #EXTINF:-1 tvg-id="DiezTVEncarnacion.mx",DiezTV Encarnación (1080p)
 https://stream.oursnetworktv.com/latin/encoder87/playlist.m3u8
 #EXTINF:-1 tvg-id="DistritoComedia.mx",Distrito Comedia (576p)
 https://linear-405.frequency.stream/mt/studio/405/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="",Eclipse TV (720p)
+#EXTINF:-1 tvg-id="EclipseTV.mx",Eclipse TV (720p)
 https://5caf24a595d94.streamlock.net:1937/djkuxtvfah/djkuxtvfah/playlist.m3u8
-#EXTINF:-1 tvg-id="",Efeso Televisión (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="EfesoTelevision.mx",Efeso Televisión (1080p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/Esotelevision/playlist.m3u8
 #EXTINF:-1 tvg-id="XHFGLTDT.mx",El 15 TV (720p)
 https://stream.oursnetworktv.com/latin/encoder32/playlist.m3u8
@@ -145,7 +145,7 @@ https://stream.oursnetworktv.com/latin/encoder32/playlist.m3u8
 https://channel06.akamaized.net/hls/live/2033784/event01/index.m3u8
 #EXTINF:-1 tvg-id="ElNu9ve.mx",El NU9VE (1080p)
 https://linear-352.frequency.stream/mt/studio/352/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="",El Sonorense (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ElSonorense.mx",El Sonorense (1080p) [Not 24/7]
 https://s5.mexside.net:1936/elsonorense/elsonorense/playlist.m3u8
 #EXTINF:-1 tvg-id="ExpresaTV.mx",Expresa TV (720p)
 https://5ca9af4645e15.streamlock.net/teleradio/smil:teleradio.smil/playlist.m3u8
@@ -155,7 +155,7 @@ https://filmex-filmex-xumo.amagi.tv/playlist.m3u8
 https://filmex-filmexclasico-xumo.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Foro.mx",Foro TV (1080p)
 https://channel02-notusa.akamaized.net/hls/live/2023914/event01/index.m3u8
-#EXTINF:-1 tvg-id="",GikTVMx (480p)
+#EXTINF:-1 tvg-id="GikTVMX.mx",GikTVMx (480p)
 #EXTVLCOPT:http-referrer=https://giktvmx.g3radio.mx
 https://pistream.ddns.net/hls/stream.m3u8
 #EXTINF:-1 tvg-id="GoldenEdgePanregional.mx",Golden Edge Panregional (576p)
@@ -176,7 +176,7 @@ https://stream8.mexiserver.com:1936/morelostv/morelostv/playlist.m3u8
 https://stream.oursnetworktv.com/latin/encoder25/playlist.m3u8
 #EXTINF:-1 tvg-id="IngenioTV.mx",Ingenio TV (720p) [Geo-blocked]
 https://aprende-usea.streaming.media.azure.net/9317ea3f-03a0-4266-9292-ac97a0e41c4d/output-20230609-123537-manifest.ism/manifest(format=m3u8-cmaf).m3u8
-#EXTINF:-1 tvg-id="",ITV Deportes
+#EXTINF:-1 tvg-id="ITVDeportes.mx",ITV Deportes
 https://thm-it-roku.otteravision.com/thm/it/it.m3u8
 #EXTINF:-1 tvg-id="JaliscoTV.mx",Jalisco TV (720p)
 https://5fa5de1a545ae.streamlock.net/sisjalisciense/sisjalisciense/playlist.m3u8
@@ -192,7 +192,7 @@ https://stream.oursnetworktv.com/radio/luperrona415/playlist.m3u8
 https://stream.oursnetworktv.com/radio/luperronaocotlan/playlist.m3u8
 #EXTINF:-1 tvg-id="LaRancheradeCuauhtemoc.mx",La Ranchera de Cuauhtémoc 89.7 FM (720p)
 https://5fa5de1a545ae.streamlock.net/8010/8010/playlist.m3u8
-#EXTINF:-1 tvg-id="",La Voz Grupera TV (720p)
+#EXTINF:-1 tvg-id="LaVozGruperaTV.mx",La Voz Grupera TV (720p)
 https://cloudvideo.servers10.com:8081/8128/index.m3u8
 #EXTINF:-1 tvg-id="LasEstrellas.mx",Las Estrellas (1080p)
 https://channel01-onlymex.akamaized.net/hls/live/2022749/event01/index.m3u8
@@ -210,7 +210,7 @@ https://1601580044.rsc.cdn77.org/live/_jcn_/amlst:Mariavision/master.m3u8
 https://www.amixtv.com:8081/mayavision/index.m3u8
 #EXTINF:-1 tvg-id="MeganoticiasMX.mx",Meganoticias MX (1080p)
 https://pctv-meganoticias-1-mx.tcl.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Metrópoli Televisión (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="MetropoliTelevision.mx",Metrópoli Televisión (1080p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/Metropolitelevision/playlist.m3u8
 #EXTINF:-1 tvg-id="MexiquenseTV.mx",Mexiquense TV (720p)
 https://5e50264bd6766.streamlock.net/mexiquense/videomexiquense/playlist.m3u8
@@ -222,7 +222,7 @@ https://stream8.mexiserver.com:1936/misurtv/misurtv/playlist.m3u8
 https://616eee1852d6c.streamlock.net/live/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="MVSTV.mx",MVS TV [Geo-blocked]
 https://dish.akamaized.net/Content/HLS_HLS_CLR/Live/channel(mvs)/variant.m3u8
-#EXTINF:-1 tvg-id="",Nayarit Comunica
+#EXTINF:-1 tvg-id="NayaritComunica.mx",Nayarit Comunica
 https://live.iplanay.gob.mx/hls/nayarittv.m3u8
 #EXTINF:-1 tvg-id="NPlus.mx",NMás (1080p)
 https://channel07-notusa.akamaized.net/hls/live/2036971/event01/index.m3u8
@@ -230,21 +230,21 @@ https://channel07-notusa.akamaized.net/hls/live/2036971/event01/index.m3u8
 https://channel04-notusa.akamaized.net/hls/live/2029754-b/event01/index.m3u8
 #EXTINF:-1 tvg-id="NPlusMedia.mx",NMás Media (1080p)
 https://channel04-notusa.akamaized.net/hls/live/2029754/event01/index.m3u8
-#EXTINF:-1 tvg-id="",NNVeracruz (640p)
+#EXTINF:-1 tvg-id="NNVeracruz.mx",NNVeracruz (640p)
 https://s.emisoras.tv:8081/nnveracruz/index.m3u8
-#EXTINF:-1 tvg-id="",NRT México Internacional (720p)
+#EXTINF:-1 tvg-id="NRTMexicoInternacional.mx",NRT México Internacional (720p)
 https://59e88b197fb16.streamlock.net:4443/live/canal24/playlist.m3u8
-#EXTINF:-1 tvg-id="",NRT México Región Centro (720p)
+#EXTINF:-1 tvg-id="NRTMexicoRegionCentro.mx",NRT México Región Centro (720p)
 https://59e88b197fb16.streamlock.net:4443/live/canal4/playlist.m3u8
-#EXTINF:-1 tvg-id="",NRT México Región Sureste (720p)
+#EXTINF:-1 tvg-id="NRTMexicoRegionSureste.mx",NRT México Región Sureste (720p)
 https://59e88b197fb16.streamlock.net:4443/live/canal6/playlist.m3u8
 #EXTINF:-1 tvg-id="NueveTV.mx",Nueve TV San Luís Potosí (720p)
 https://5ca9af4645e15.streamlock.net/nuevetv/videonuevetv/.m3u8
-#EXTINF:-1 tvg-id="",Ola Grupera (720p)
+#EXTINF:-1 tvg-id="OlaGrupera.mx",Ola Grupera (720p)
 https://s.emisoras.tv:8081/olagruperamx/index.m3u8
 #EXTINF:-1 tvg-id="XEIPNTDT.mx",Once México (1080p)
 https://vivo.canaloncelive.tv/alivepkgr3/ngrp:cepro_all/playlist.m3u8
-#EXTINF:-1 tvg-id="",Paralelo 20 650 AM (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Paralelo20650AM.mx",Paralelo 20 650 AM (1080p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/paralelo20/playlist.m3u8
 #EXTINF:-1 tvg-id="PresumiendoMexico.mx",Presumiendo México (720p)
 https://5ca39be538307.streamlock.net/telemetrika/smil:telemetrika.smil/playlist.m3u8
@@ -252,11 +252,11 @@ https://5ca39be538307.streamlock.net/telemetrika/smil:telemetrika.smil/playlist.
 https://stream.oursnetworktv.com/latin/encoder12/playlist.m3u8
 #EXTINF:-1 tvg-id="RadarTV71.mx",Radar TV 71 (480p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/radarTV/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio y Televisión Budokan (352p)
+#EXTINF:-1 tvg-id="RadioyTelevisionBudokan.mx",Radio y Televisión Budokan (352p)
 https://cp.panelchs.com:1936/8016/8016/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio y Televisión Crisol de la Alegría (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioyTelevisionCrisoldelaAlegria.mx",Radio y Televisión Crisol de la Alegría (1080p) [Not 24/7]
 https://omegaingenieria.com:19360/CRisolTVdigital-Live_abr/CRisolTVdigital-Live_abr.m3u8
-#EXTINF:-1 tvg-id="",Raly TV (720p)
+#EXTINF:-1 tvg-id="RalyTV.mx",Raly TV (720p)
 https://cloudvideo.servers10.com:8081/8072/index.m3u8
 #EXTINF:-1 tvg-id="RCGTV.mx",RCG TV (1080p)
 https://video1.getstreamhosting.com:1936/8172/8172/playlist.m3u8
@@ -278,9 +278,9 @@ http://189.240.210.28:1935/envivo/puecom/playlist.m3u8
 http://189.240.210.28:1935/live/setpuebla/playlist.m3u8
 #EXTINF:-1 tvg-id="SintesisTV.mx",Síntesis TV (480p)
 https://raw.githubusercontent.com/azgaresncf/strm2hls/main/streams/sintesis_tv.m3u8
-#EXTINF:-1 tvg-id="",SIPSE TV 8.1 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SIPSETV81.mx",SIPSE TV 8.1 (1080p) [Not 24/7]
 https://webprod.sipse.com.mx:8080/show/merida.m3u8
-#EXTINF:-1 tvg-id="",SIPSE TVCUN 8.1 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SIPSETVCUN81.mx",SIPSE TVCUN 8.1 (1080p) [Not 24/7]
 https://webprod.sipse.com.mx:8080/show/tvcun.m3u8
 #EXTINF:-1 tvg-id="SistemaMichoacanodeTV.mx",Sistema Michoacano de TV (1080p)
 https://60ed5b6d0df78.streamlock.net:1936/enlinea/enlinea/playlist.m3u8
@@ -292,10 +292,6 @@ https://servilive.com:3263/live/channel12live.m3u8
 https://stream.oursnetworktv.com/latin/encoder53/playlist.m3u8
 #EXTINF:-1 tvg-id="TeleFormula.mx",TeleFórmula (720p) [Geo-blocked]
 https://mdstrm.com/live-stream-playlist/62f2c855f7981b5a5a2d8763.m3u8
-#EXTINF:-1 tvg-id="TeleHit.mx",Telehit (1080p)
-http://45.175.139.194:8000/play/62
-#EXTINF:-1 tvg-id="TelehitMusica.mx",Telehit Musica (1080p)
-http://190.60.42.86:8000/play/a02x/index.m3u8
 #EXTINF:-1 tvg-id="TelemarCampeche.mx",Telemar Campeche (720p) [Not 24/7]
 https://5e50264bd6766.streamlock.net/telemarcampeche/videotelemarcampeche/playlist.m3u8
 #EXTINF:-1 tvg-id="XEWHTDT.mx",Telemax (XEWH-TDT) (1080p)
@@ -348,7 +344,7 @@ https://5ca3e84a76d30.streamlock.net/tvmarvallarta/videotvmarvallarta/playlist.m
 https://s6.mexside.net:1936/migrantetv/migrantetv/playlist.m3u8
 #EXTINF:-1 tvg-id="XHMNLTDT.mx",TV Nuevo León Canal 28 (XHMNL-TDT) (720p)
 https://s5.mexside.net:1936/canal28/canal28/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV San Luis (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVSanLuis.mx",TV San Luis (720p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/sanluistv/playlist.m3u8
 #EXTINF:-1 tvg-id="TVUJAT.mx",TV UJAT (XHUJAT-TDT) (720p) [Not 24/7]
 https://5e50264bd6766.streamlock.net/ujat/videoujat/playlist.m3u8
@@ -360,7 +356,7 @@ https://5ca9af4645e15.streamlock.net/rtv/videortv/playlist.m3u8
 https://5ca3e84a76d30.streamlock.net/gpacifico1/smil:gpculiacan.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPLosMochis.mx",TVP Los Mochis (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico2/mochis.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",TVP Mazatlán (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVPMazatlan.mx",TVP Mazatlán (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico4/smil:mazatlan.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVPObregon.mx",TVP Obregón (720p) [Not 24/7]
 https://5ca3e84a76d30.streamlock.net/gpacifico3/obregon.smil/playlist.m3u8
@@ -378,9 +374,9 @@ https://stream8.mexiserver.com:19360/vbmediatv-1/vbmediatv-1.m3u8
 https://capomo01-enitv.eninetworks.com/locales_vbmedia_publico/index.m3u8
 #EXTINF:-1 tvg-id="VeracruzMultimediosTV.mx",Veracruz Multimedios TV (720p)
 https://stream.oursnetworktv.com/latin/VeracruZMulTimedios/playlist.m3u8
-#EXTINF:-1 tvg-id="",Videa Plataforma (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="VideaPlataforma.mx",Videa Plataforma (576p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder34/playlist.m3u8
-#EXTINF:-1 tvg-id="",Visión Televisión (720p)
+#EXTINF:-1 tvg-id="VisionTelevision.mx",Visión Televisión (720p)
 https://cloudvideo.servers10.com:8081/8016/index.m3u8
 #EXTINF:-1 tvg-id="ViXJajaja.mx",ViX Jajaja (1080p)
 https://d1f3q72l8uy8ur.cloudfront.net/dist/samsungtv/318/hls/master/playlist.m3u8
@@ -396,3 +392,7 @@ https://stream.oursnetworktv.com/latin/encoder73/playlist.m3u8
 https://stream8.mexiserver.com:1936/xtinetwork/xtinetwork/playlist.m3u8
 #EXTINF:-1 tvg-id="ZAZ.mx",ZAZ
 https://cloud.fastchannel.es/mic/manifiest/hls/zaztv/zaztv.m3u8
+#EXTINF:-1 tvg-id="TelehitMusica.mx",Telehit Musica (1080p)
+http://190.60.42.86:8000/play/a02x/index.m3u8
+#EXTINF:-1 tvg-id="TeleHit.mx",Telehit (1080p)
+http://45.175.139.194:8000/play/62
diff --git a/streams/mx_multimedios.m3u b/streams/mx_multimedios.m3u
index 9449cc07c..c8c408bbb 100644
--- a/streams/mx_multimedios.m3u
+++ b/streams/mx_multimedios.m3u
@@ -3,7 +3,7 @@
 https://mdstrm.com/live-stream-playlist/610178c7db32a4112d994650.m3u8
 #EXTINF:-1 tvg-id="MultimediosBajio.mx",Multimedios Bajío (720p) [Not 24/7]
 https://mdstrm.com/live-stream-playlist/5d4b0fec848918070128c8cb.m3u8
-#EXTINF:-1 tvg-id="",Multimedios CDMX (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MultimediosCDMX.mx",Multimedios CDMX (720p) [Not 24/7]
 https://mdstrm.com/live-stream-playlist/5f2d9d6ff17144074bd8a284.m3u8
 #EXTINF:-1 tvg-id="MultimediosCiudadJuarez.mx",Multimedios Ciudad Juárez (720p) [Not 24/7]
 https://mdstrm.com/live-stream-playlist/5d9e440d675235586a92be7f.m3u8
diff --git a/streams/mz.m3u b/streams/mz.m3u
index 1b8460d19..336e31d64 100644
--- a/streams/mz.m3u
+++ b/streams/mz.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="TVManaMocambique.mz",TV Maná Moçambique (1080p)
 https://w2.manasat.com/tvmana-mz/smil:tvmana-mz.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV Vitória (720p)
+#EXTINF:-1 tvg-id="TVVitoria.mz",TV Vitória (720p)
 https://stmv1.srvif.com/tvvitoriamz/tvvitoriamz/playlist.m3u8
 #EXTINF:-1 tvg-id="TVM.mz",TVM (480p)
 http://196.28.226.121:1935/live/smil:Channel1.smil/playlist.m3u8
diff --git a/streams/na.m3u b/streams/na.m3u
index 8b4433bc6..214a06acd 100644
--- a/streams/na.m3u
+++ b/streams/na.m3u
@@ -1,3 +1,3 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",NTV (720p)
+#EXTINF:-1 tvg-id="NTV.na",NTV (720p)
 https://s-pl-01.mediatool.tv/playout/ntv-abr/index.m3u8
diff --git a/streams/ng.m3u b/streams/ng.m3u
index 4689d1b5a..dea44bc26 100644
--- a/streams/ng.m3u
+++ b/streams/ng.m3u
@@ -5,13 +5,13 @@ https://webstreaming.viewmedia.tv/web_014/Stream/playlist.m3u8
 https://webstreaming.viewmedia.tv/web_045/Stream/playlist.m3u8
 #EXTINF:-1 tvg-id="AfricaTV3.ng",Africa TV3 (720p) [Not 24/7]
 http://africatv.live.net.sa:1935/live/africatv3/playlist.m3u8
-#EXTINF:-1 tvg-id="",AfroSport Nigeria
+#EXTINF:-1 tvg-id="AfroSportNigeria.ng",AfroSport Nigeria
 https://newproxy3.vidivu.tv/vidivu_afrosport/index.m3u8
 #EXTINF:-1 tvg-id="AITNational.ng",AIT National (576p)
 https://webstreaming.viewmedia.tv/web_036/Stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",AMusic Channel (720p)
+#EXTINF:-1 tvg-id="AMusicChannel.ng",AMusic Channel (720p)
 http://mn-nl.mncdn.com/amusictv/amusicsrt.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",APTIM TV (720p)
+#EXTINF:-1 tvg-id="APTIMTV.ng",APTIM TV (720p)
 https://stream.commec.tv/6447b2559d8b0711e2fa75cc/live_222c2dc0b69f11ee8c3c99218c8c67c4/index.fmp4.m3u8
 #EXTINF:-1 tvg-id="ATN.ng",ATN (480p)
 https://tv2.ifastekpanel.com:3013/live/atntvlive.m3u8
@@ -23,7 +23,7 @@ https://webstreaming.viewmedia.tv/web_013/Stream/playlist.m3u8
 https://webstreaming-3.viewmedia.tv/web_031/Stream/playlist.m3u8
 #EXTINF:-1 tvg-id="ChosenTVEnglish.ng",Chosen TV English (360p)
 https://webstreaming-2.viewmedia.tv/web_024/Stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",cLoveworld TV (480p)
+#EXTINF:-1 tvg-id="cLoveworldTV.ng",cLoveworld TV (480p)
 https://live-hls-5rxy.livepush.io/live_cdn/em_LJ5aZjqp0LdiQ/index.m3u8
 #EXTINF:-1 tvg-id="CozaTV.ng",Coza TV (576p)
 https://webstreaming-7.viewmedia.tv/web_097/Stream/playlist.m3u8
@@ -39,9 +39,9 @@ https://webstreaming-3.viewmedia.tv/web_033/Stream/playlist.m3u8
 https://5d846bfda90fc.streamlock.net:1935/live/galaxytv/playlist.m3u8
 #EXTINF:-1 tvg-id="GMTV.ng",GMTV (480p)
 https://webstreaming-11.viewmedia.tv/web_160/Stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",HoremowTV (1080p)
+#EXTINF:-1 tvg-id="HoremowTV.ng",HoremowTV (1080p)
 https://tvsw6-hls.secdn.net/tvsw6-chorigin/play/prod-2859eecc9b514f2bb955290066ef172d/playlist.m3u8
-#EXTINF:-1 tvg-id="",Kingsview TV (1080p)
+#EXTINF:-1 tvg-id="KingsviewTV.ng",Kingsview TV (1080p)
 https://j78dp6reyq5r-hls-live.5centscdn.com/4896_push_1963_001/00cb1f2e4ff89048f2e77e26940c00e6.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="LiberationTV.ng",Liberation TV (576p)
 https://webstreaming.viewmedia.tv/web_011/Stream/playlist.m3u8
@@ -49,21 +49,21 @@ https://webstreaming.viewmedia.tv/web_011/Stream/playlist.m3u8
 https://webstreaming-11.viewmedia.tv/web_152/Stream/playlist.m3u8
 #EXTINF:-1 tvg-id="LN247.ng",LN247 (1080p)
 https://go5lmb6oyawb-hls-live.5centscdn.com/station/3dfd3752af3d7aec5c53992c2da3a316.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",Lovetoons TV (720p)
+#EXTINF:-1 tvg-id="LovetoonsTV.ng",Lovetoons TV (720p)
 https://kali1.everestcast.com:3674/stream/play.m3u8
 #EXTINF:-1 tvg-id="LoveWorldArabic.ng",LoveWorld Arabic (360p)
 https://webstreaming.viewmedia.tv/web_044/Stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",LoveWorld Asia (1080p)
+#EXTINF:-1 tvg-id="LoveWorldAsia.ng",LoveWorld Asia (1080p)
 https://cdnstack.internetmultimediaonline.org/auxano/Hindilanx/index.m3u8
-#EXTINF:-1 tvg-id="",LoveWorld CASA (614p)
+#EXTINF:-1 tvg-id="LoveWorldCASA.ng",LoveWorld CASA (614p)
 https://j78dp6reyq5r-hls-live.5centscdn.com/kview/5c6d78cffa59e129f040fcec2d788532.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",LoveWorld Euro (270p)
+#EXTINF:-1 tvg-id="LoveWorldEuro.ng",LoveWorld Euro (270p)
 https://cdnstack.internetmultimediaonline.org/auxano/Cespain/index.m3u8
-#EXTINF:-1 tvg-id="",LoveWorld Italia (1080p)
+#EXTINF:-1 tvg-id="LoveWorldItalia.ng",LoveWorld Italia (1080p)
 https://cdnstack.internetmultimediaonline.org/auxano/italianlanx/index.m3u8
 #EXTINF:-1 tvg-id="LoveWorldPersia.ng",LoveWorld Persia (480p)
 https://cdn3.wowza.com/5/aVJETlF0UFdmYTFu/LWPP/ngrp:persia.stream_all/playlist.m3u8
-#EXTINF:-1 tvg-id="",LoveWorld XP (480p)
+#EXTINF:-1 tvg-id="LoveworldXP.ng",LoveWorld XP (480p)
 https://bus-asia-east-1-cimzmgnuu-cdn.sa.metacdn.com/live/ngrp:livestream2022_main_all_transcode/playlist.m3u8
 #EXTINF:-1 tvg-id="MastersTV.ng",Master's TV (720p)
 https://mn-nl.mncdn.com/commectv_live/masterstv/index.m3u8
@@ -102,7 +102,7 @@ https://video1.getstreamhosting.com:1936/8398/8398/playlist.m3u8
 https://webstreaming.viewmedia.tv/web_038/Stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TVC.ng",TVC (1080p)
 https://tvce.gridpapaservers.com/TVCSEPT/ngrp:myStream_all/playlist.m3u8
-#EXTINF:-1 tvg-id="",Waffi TV (240p)
+#EXTINF:-1 tvg-id="WaffiTV.ng",Waffi TV (240p)
 https://oqgdro3xd4rm-hls-live.5centscdn.com/waffiitvstreaminglivetfmediacast/e0885d428bea69e372309657f3bd895f.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="WapTV.ng",Wap TV (720p) [Not 24/7]
 https://newproxy3.vidivu.tv/waptv/index.m3u8
@@ -112,5 +112,5 @@ https://wazobia.live:8333/channel/wmaxabuja.m3u8
 https://wazobia.live:8333/channel/wmax.m3u8
 #EXTINF:-1 tvg-id="WazobiaMaxTVPortHarcourt.ng",Wazobia Max TV Port Harcourt (720p)
 https://wazobia.live:8333/channel/wmaxph.m3u8
-#EXTINF:-1 tvg-id="",Whole Word TV (720p)
+#EXTINF:-1 tvg-id="WholeWordTV.ng",Whole Word TV (720p)
 https://mn-nl.mncdn.com/wholewordtv/wholewordtv/index.m3u8
diff --git a/streams/ni.m3u b/streams/ni.m3u
index 05231c58f..5746442cc 100644
--- a/streams/ni.m3u
+++ b/streams/ni.m3u
@@ -27,16 +27,16 @@ https://hdbox.chunklistv.com/live?stream=jbn39
 https://cootv.cootel.com.ni:8095/Canal22_CooTel/playlist.m3u8
 #EXTINF:-1 tvg-id="MegaBox.ni",MegaBox (720p) [Not 24/7]
 https://hdbox.chunklistv.com/live?stream=megabox
-#EXTINF:-1 tvg-id="",Radio Visión de Dios Stereo (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioVisiondeDiosStereo.ni",Radio Visión de Dios Stereo (720p) [Not 24/7]
 https://live.tvcontrolcp.com:1936/8286/8286/playlist.m3u8
-#EXTINF:-1 tvg-id="",Telenorte (1080p)
+#EXTINF:-1 tvg-id="Telenorte.ni",Telenorte (1080p)
 #EXTVLCOPT:http-referrer=https://odysee.com/
 https://cloud.odysee.live/content/e4037b515169fa8e91645219d0f48aa2e69f0546/master.m3u8
 #EXTINF:-1 tvg-id="TV45.ni",TV45-3ABN Nicaragua (720p) [Not 24/7]
 https://hdbox.chunklistv.com/live?stream=3abn-nicaragua
-#EXTINF:-1 tvg-id="",TV Centro Canal Regional (720p)
+#EXTINF:-1 tvg-id="TVCentroCanalRegional.ni",TV Centro Canal Regional (720p)
 https://amixtv.com:19360/tvcentro/tvcentro.m3u8
-#EXTINF:-1 tvg-id="",TVONE Nicaragua (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVONENicaragua.ni",TVONE Nicaragua (720p) [Not 24/7]
 https://hdbox.chunklistv.com/live?stream=tvone
 #EXTINF:-1 tvg-id="VosTV.ni",Vos TV (720p) [Not 24/7]
 http://ott.streann.com:8080/loadbalancer/services/public/channels/59e60c4997381ef50d15c041/playlist.m3u8
diff --git a/streams/nl.m3u b/streams/nl.m3u
index 92e4167fd..a0a890950 100644
--- a/streams/nl.m3u
+++ b/streams/nl.m3u
@@ -53,7 +53,7 @@ http://59132e529e3d1.streamlock.net/Groningen1/Groningen1/playlist.m3u8
 https://d2qm50imcbcfqx.cloudfront.net/nlpo/clr-nlpo/haarlem105/index.m3u8
 #EXTINF:-1 tvg-id="HTRTV.nl",HTR TV (720p)
 https://ms7.mx-cd.net/tv/286-3043214/HTR_Media_TV.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Hype Visual Radio (1080p)
+#EXTINF:-1 tvg-id="HypeVisualRadio.nl",Hype Visual Radio (1080p)
 https://streammix.alsolnet.com/hyperadio/live/playlist.m3u8
 #EXTINF:-1 tvg-id="IdeaalTV.nl",Ideaal TV (480p) [Not 24/7]
 https://ms2.mx-cd.net/dtv-09/236-2051366/Ideaal_TV.smil/playlist.m3u8
diff --git a/streams/no_samsung.m3u b/streams/no_samsung.m3u
index 0b7141aa4..6a4607821 100644
--- a/streams/no_samsung.m3u
+++ b/streams/no_samsung.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",AfricaNews English (720p)
+#EXTINF:-1 tvg-id="AfricanewsEnglish.fr",AfricaNews English (720p)
 https://rakuten-africanews-1-no.samsung.wurl.tv/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1-no.samsung.wurl.tv/manifest/playlist.m3u8
diff --git a/streams/np.m3u b/streams/np.m3u
index 8fea46449..959047afd 100644
--- a/streams/np.m3u
+++ b/streams/np.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="CapitalTVHD.np",Capital TV (1080p)
 https://streaming.tvnepal.com:19360/capitaltv/capitaltv.m3u8
-#EXTINF:-1 tvg-id="",Divya Darshan TV (720p)
+#EXTINF:-1 tvg-id="DivyaDarshanTV.np",Divya Darshan TV (720p)
 http://live.divyadarshantv.com/hls/stream.m3u8
-#EXTINF:-1 tvg-id="",Hamro Kisan TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="HamroKisanTV.np",Hamro Kisan TV (1080p) [Not 24/7]
 https://realtvlive.servep2p.com/livetv/KSNTV/playlist.m3u8
 #EXTINF:-1 tvg-id="HimalayaTV.np",Himalaya TV
 http://103.213.31.243:8081/livepull/ottHIMALAYA480.stream/playlist.m3u8
@@ -19,5 +19,5 @@ https://ktvhdsg.ekantipur.com:8443/ktv_desktop_02347834/hd/playlist.m3u8
 http://150.107.205.212:1935/live/mithila/playlist.m3u8?DVR=
 #EXTINF:-1 tvg-id="ParyawaranTV.np",Paryawaran TV (1080p)
 https://webtv-stream.nettv.com.np/broadcaster/Paryawaran.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Zee Nepal (720p)
+#EXTINF:-1 tvg-id="ZeeNepal.np",Zee Nepal (720p)
 http://43.245.85.211:5563/live/zeenepaltv/playlist.m3u8
diff --git a/streams/pa.m3u b/streams/pa.m3u
index 703fbf56b..92bcdae52 100644
--- a/streams/pa.m3u
+++ b/streams/pa.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",A&R Canal Adventista (720p)
+#EXTINF:-1 tvg-id="ARCanal.pa",A&R Canal Adventista (720p)
 http://51.222.9.192:3589/stream/play.m3u8
 #EXTINF:-1 tvg-id="BTVPanama.pa",BTV Panamá (720p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/btvpanama/playlist.m3u8
 #EXTINF:-1 tvg-id="DreikoTV.pa",DreikoTv (720p) [Not 24/7]
 https://cloudvideo.servers10.com:8081/8138/index.m3u8
-#EXTINF:-1 tvg-id="",Fabulosa Estéreo 100.5 FM (720p)
+#EXTINF:-1 tvg-id="FabulosaEstereo1005FM.pa",Fabulosa Estéreo 100.5 FM (720p)
 https://www.streaming507.net:19360/videofabulosa/videofabulosa.m3u8
 #EXTINF:-1 tvg-id="HispaniaTV.pa",Hispania TV (1080p) [Not 24/7]
 https://vcp8.myplaytv.com:1936/hispaniatv/hispaniatv/playlist.m3u8
@@ -19,21 +19,21 @@ https://vcp4.myplaytv.com:1936/mas23/mas23/playlist.m3u8
 https://video.misistemareseller.com/minfavtv/minfavtv/playlist.m3u8
 #EXTINF:-1 tvg-id="NexTVCanal21.pa",Nex TV Canal 21 (1080p)
 https://vcp4.myplaytv.com:1936/nextv/nextv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Planet 100.9 FM (1080p)
+#EXTINF:-1 tvg-id="Planet1009FM.pa",Planet 100.9 FM (1080p)
 https://streamlov.alsolnet.com/planet1009fm/live/playlist.m3u8
 #EXTINF:-1 tvg-id="PlusTV.pa",Plus TV (720p) [Not 24/7]
 https://vcp4.myplaytv.com:1936/plustv/plustv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Ancón (720p)
+#EXTINF:-1 tvg-id="RadioAncon.pa",Radio Ancón (720p)
 https://www.streaming507.net:19360/anconvideo/anconvideo.m3u8
-#EXTINF:-1 tvg-id="",Radio Hogar (720p)
+#EXTINF:-1 tvg-id="RadioHogar.pa",Radio Hogar (720p)
 https://www.streaming507.net:19360/videoradiohogar/videoradiohogar.m3u8
-#EXTINF:-1 tvg-id="",Radio Reforma Se Oye (720p)
+#EXTINF:-1 tvg-id="RadioReformaSeOye.pa",Radio Reforma Se Oye (720p)
 https://www.streaming507.net:19360/mevo2/mevo2.m3u8
 #EXTINF:-1 tvg-id="SomosCulturaTV.pa",Somos Cultura TV (720p)
 https://srv.tropicalmoonmedia.com/somosculturatv/somosculturatv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Súper Q Panamá (1080p)
+#EXTINF:-1 tvg-id="SuperQPanama.pa",Súper Q Panamá (1080p)
 https://vcp8.myplaytv.com:1936/superq/superq/playlist.m3u8
-#EXTINF:-1 tvg-id="",Tropi Q 99.7 FM (1080p)
+#EXTINF:-1 tvg-id="TropiQ997FM.pa",Tropi Q 99.7 FM (1080p)
 https://www.streaming507.net:19360/videotropiq/videotropiq.m3u8
 #EXTINF:-1 tvg-id="TropicalMoonCumbiaTV.pa",Tropical Moon Cumbia TV (720p)
 https://srv2.tropicalmoonmedia.com/cumbiatv/cumbiatv/playlist.m3u8
diff --git a/streams/pe.m3u b/streams/pe.m3u
index 75a96604b..fd91174c8 100644
--- a/streams/pe.m3u
+++ b/streams/pe.m3u
@@ -83,7 +83,7 @@ https://cloudvideo.servers10.com:8081/impactotv/index.m3u8
 https://video2.lhdserver.es/cableperu/live.m3u8
 #EXTINF:-1 tvg-id="JN19.pe",JN19 (1080p) [Not 24/7]
 https://servilive.com:3028/live/jntv19live.m3u8
-#EXTINF:-1 tvg-id="",JN19 TV2 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="JN192.pe",JN19 TV2 (1080p) [Not 24/7]
 https://servilive.com:3224/live/jn19tv2live.m3u8
 #EXTINF:-1 tvg-id="JNETV.pe",JNE TV (720p) [Not 24/7]
 https://dc1.webstream.eu/v1/jnetvhdstreaming/rtd144395a1/webstr,_video,_video_sd,_video_sd2,.mp4.urlset/master.m3u8
@@ -97,7 +97,7 @@ https://vdo.grupolimalive.com:3277/live/riberenatvlive.m3u8
 https://redirector.rudo.video/hls-video/567ffde3fa319fadf3419efda25619456231dfea/latina/latina.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="Latina.pe",Latina (720p) [Geo-blocked]
 https://live-latinav2-mdstrm.secure.footprint.net/live-stream-mp/d1aden84nxx8u4/3330943a0248407faa8c6f5f5c874fa4/5ce7109c7398b977dc0744cd/index.m3u8
-#EXTINF:-1 tvg-id="",Like TV
+#EXTINF:-1 tvg-id="LikeTV.pe",Like TV
 https://vdo.grupolimalive.com:3618/live/liketvlive.m3u8
 #EXTINF:-1 tvg-id="LimaLive.pe",LimaLive (720p) [Not 24/7]
 https://vdo.grupolimalive.com:3245/stream/play.m3u8
@@ -127,7 +127,7 @@ https://vs8.live.opencaster.com/20100152275/jcpstream/playlist.m3u8
 https://www.opencaster.com/resources/hls_stream/hipodromojcp2.m3u8
 #EXTINF:-1 tvg-id="MonterricoTV.pe",Monterrico TV (360p) [Not 24/7]
 https://ed3od.live.opencaster.com/jcpstream_mid/index.m3u8
-#EXTINF:-1 tvg-id="",Nacional Tv Peru
+#EXTINF:-1 tvg-id="NacionalTvPeru.pe",Nacional Tv Peru
 https://s1.tvdatta.com:3349/live/nacionaltvlive.m3u8
 #EXTINF:-1 tvg-id="Nativa.pe",Nativa (720p) [Not 24/7]
 https://oneplay.iptvperu.tv:1936/static/nativa1.stream/chunks.m3u8
@@ -153,13 +153,13 @@ http://cdn2.ujjina.com:1935/iptvovacion1/liveovacion1tv/playlist.m3u8
 https://5c3fb01839654.streamlock.net:1963/iptvovacion1/liveovacion1tv/playlist.m3u8
 #EXTINF:-1 tvg-id="PanamericanaTV.pe",Panamericana TV (1080p) [Not 24/7]
 https://cdnhd.iblups.com/hls/ptv5.m3u8
-#EXTINF:-1 tvg-id="",Panc TV Peru (1080p)
+#EXTINF:-1 tvg-id="PancTVPeru.pe",Panc TV Peru (1080p)
 https://panel.host-live.com:19360/80780/80780.m3u8
 #EXTINF:-1 tvg-id="",Peru Visual TV
 https://stmv5.voxtvhd.com.br/peruvisual/peruvisual/playlist.m3u8
 #EXTINF:-1 tvg-id="PeruvianRadioTV.pe",PeruvianRadio TV
 https://vdo.grupolimalive.com:3399/stream/play.m3u8
-#EXTINF:-1 tvg-id="",Planea TV
+#EXTINF:-1 tvg-id="PlaneaTV.pe",Planea TV
 https://vdo.grupolimalive.com:3045/live/planeatvlive.m3u8
 #EXTINF:-1 tvg-id="PlanetaTV.pe",Planeta TV (720p) [Not 24/7]
 https://live.obslivestream.com/planetatv/index.m3u8
@@ -187,8 +187,6 @@ https://5c3fb01839654.streamlock.net:1963/iptvrcrperu/livercrperutv/playlist.m3u
 https://servilive.com:3757/live/regiontvlive.m3u8
 #EXTINF:-1 tvg-id="RNTelevision.pe",RN Televisión (720p) [Not 24/7]
 https://videoserver.tmcreativos.com:19360/rnyurimaguas/rnyurimaguas.m3u8
-#EXTINF:-1 tvg-id="RSelvaTV.pe",RSelvaTV
-https://live.obslivestream.com/selvatv/index.m3u8
 #EXTINF:-1 tvg-id="RTVTotalYurimaguas.pe",RTV Total (Yurimaguas) (480p) [Not 24/7]
 https://7.innovatestream.pe:19360/rtvtotal/rtvtotal.m3u8
 #EXTINF:-1 tvg-id="RWTelevisionTarapoto.pe",RW Televisión Tarapoto (720p) [Not 24/7]
@@ -211,7 +209,7 @@ https://vdo.grupolimalive.com:3927/live/milleniumlive.m3u8
 https://live.obslivestream.com/telecolormux/index.m3u8
 #EXTINF:-1 tvg-id="Telelima.pe",Telelima
 https://mserver.latincable.net/TeleLima/index.m3u8
-#EXTINF:-1 tvg-id="",Teleselva
+#EXTINF:-1 tvg-id="Teleselva.pe",Teleselva
 https://7.innovatestream.pe:19360/tvnoticiassatipo/tvnoticiassatipo.m3u8
 #EXTINF:-1 tvg-id="TelesurCamana.pe",Telesur Camana (720p)
 https://1667517699.rsc.cdn77.org/hls/camana.m3u8
@@ -255,7 +253,7 @@ https://62fc643fbf1aa.streamlock.net/TVperuanisima/TVperuanisima/playlist.m3u8
 https://stmv1.voxhdnet.com/sistemascusco/sistemascusco/playlist.m3u8
 #EXTINF:-1 tvg-id="TVenLinea.pe",TVenLinea (720p) [Not 24/7]
 https://s1.tvdatta.com:3883/live/tvenlinealive.m3u8
-#EXTINF:-1 tvg-id="",TVUNO (720p)
+#EXTINF:-1 tvg-id="TVUNO.pe",TVUNO (720p)
 https://streamtv.onliv3.online:1936/karibtv/karibtv/playlist.m3u8
 #EXTINF:-1 tvg-id="UcayalinadeTelevision.pe",Ucayalina de Televisión [Not 24/7]
 https://video.agenciastreaming.com:3959/live/utvlive.m3u8
@@ -293,3 +291,5 @@ https://live.obslivestream.com/wtv/index.m3u8
 https://vdo.panelchs.com:3927/live/xtvcontrollive.m3u8
 #EXTINF:-1 tvg-id="",X TV Zona Film
 https://vdo.panelchs.com:3769/live/vdo54575151live.m3u8
+#EXTINF:-1 tvg-id="RSelvaTV.pe",RSelvaTV
+https://live.obslivestream.com/selvatv/index.m3u8
diff --git a/streams/ph.m3u b/streams/ph.m3u
index 7a3fbb989..1350defac 100644
--- a/streams/ph.m3u
+++ b/streams/ph.m3u
@@ -15,7 +15,7 @@ https://cinemaone-abscbn-ono.amagi.tv/index.m3u8
 https://live.cltv36.tv:5443/LiveApp/streams/live.m3u8
 #EXTINF:-1 tvg-id="DepEdTV.ph",DepEd TV (480p) [Geo-blocked]
 https://d3cbe0gidjd4k2.cloudfront.net/channel_7/channel7/playlist.m3u8
-#EXTINF:-1 tvg-id="",Dreamstar TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="DreamstarTV.ph",Dreamstar TV (720p) [Not 24/7]
 https://ssh101-fl.bozztv.com/ssh101/dreamstartvnew/index.m3u8
 #EXTINF:-1 tvg-id="GreatCommissionTV.ph",Great Commission TV (468p)
 http://45.32.115.103/live/livestream/index.m3u8
diff --git a/streams/pk.m3u b/streams/pk.m3u
index 983fa7873..715e6cf3c 100644
--- a/streams/pk.m3u
+++ b/streams/pk.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="92NewsHD.pk",92 News HD (720p)
 http://92news.vdn.dstreamone.net/92newshd/92hd/playlist.m3u8
-#EXTINF:-1 tvg-id="",92 News UK (576p)
+#EXTINF:-1 tvg-id="92NewsUK.uk",92 News UK (576p)
 https://securecontributions.sechls01.visionip.tv/live/securecontributions-securecontributions-92_news-hsslive-25f-16x9-SD/chunklist.m3u8
 #EXTINF:-1 tvg-id="AlEhsaanTV.pk",Al Ehsaan TV (720p)
 https://cdn.bmstudiopk.com/alehsaan/live/playlist.m3u8
diff --git a/streams/pl.m3u b/streams/pl.m3u
index bcbea81d8..f29052c2d 100644
--- a/streams/pl.m3u
+++ b/streams/pl.m3u
@@ -15,7 +15,7 @@ http://178.219.128.68:64888/DISNXD
 http://94.246.128.53:1935/tv/dlaCiebieTv/playlist.m3u8
 #EXTINF:-1 tvg-id="dlaCiebietv.pl",dlaCiebie.tv (1080p) [Not 24/7]
 https://6034e09794f07.streamlock.net/tv/dlaCiebieTv/playlist.m3u8
-#EXTINF:-1 tvg-id="",EWTN Poland (1080p)
+#EXTINF:-1 tvg-id="EWTNPoland.pl",EWTN Poland (1080p)
 https://cdn3.wowza.com/1/ZHdrMWt1NjlDSzFu/bzdDVG10/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EzoTV.pl",Ezo TV (576p) [Not 24/7]
 http://live.ezotv.pl:1935/live/EZOTV/playlist.m3u8
@@ -23,15 +23,13 @@ http://live.ezotv.pl:1935/live/EZOTV/playlist.m3u8
 https://stream.hopechannel.pl/livetv/colombo/hope.m3u8
 #EXTINF:-1 tvg-id="NickJr.pl",Nick Jr. Poland (576i)
 http://178.219.128.68:64888/NICKJR
-#EXTINF:-1 tvg-id="Polsat.pl" tvg-shift="3 minutes",Polsat (1080p) [Geo-blocked]
-https://lb2-e2-19.pluscdn.pl/ch/1502600/308/dash/20a18c30/live.mpd
 #EXTINF:-1 tvg-id="RadiowaCzworka.pl",Radio Czwórka (1080p)
 https://stream14.polskieradio.pl/pr4_video/video_pr4.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="SferaTV.pl",Sfera TV (480p) [Not 24/7]
 http://stream.sferatv.pl:1935/sferalive/smil:sferalive.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TelewizjaBiznesowa.pl",Telewizja Biznesowa (1080p)
 https://s-pl-01.mediatool.tv/playout/tbpl-abr/index.m3u8
-#EXTINF:-1 tvg-id="",Telewizja Lubań (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TelewizjaLuban.pl",Telewizja Lubań (720p) [Not 24/7]
 http://stream.herissons.cloud/hls/tvluban.m3u8
 #EXTINF:-1 tvg-id="TelewizjaPograniczeGlubczyce.pl",Telewizja Pogranicze Glubczyce (720p)
 https://stream.elzappero.net/tvglubczyce.m3u8
@@ -39,9 +37,7 @@ https://stream.elzappero.net/tvglubczyce.m3u8
 http://217.173.176.107:1935/live/ngrp:tvk.stream_mobile/chunks.m3u8
 #EXTINF:-1 tvg-id="TrusoTV.pl",Truso TV (576p) [Not 24/7]
 https://stream.truso.tv/elblag/myStream_aac/playlist.m3u8
-#EXTINF:-1 tvg-id="TV4.pl" tvg-shift="3 minutes",TV4 (1080p) [Geo-blocked]
-https://lb2-e2-32.pluscdn.pl/ch/1502601/309/dash/e25c2c93/live.mpd
-#EXTINF:-1 tvg-id="",TV ASTA (720p)
+#EXTINF:-1 tvg-id="TVASTA.pl",TV ASTA (720p)
 https://5cce8c6f0e84c.streamlock.net/LiveCast/smil:PlayStream9.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TelewizjaImperium.pl",TV Imperium (1080p) [Not 24/7]
 https://91-193-208-10.eimperium.pl/TVIMPERIUM/index.m3u8
@@ -57,7 +53,7 @@ http://217.173.176.107:1935/live/tvk.stream/playlist.m3u8
 https://live-ch1.trwam.cf.insyscd.net/out/v1/b99041a282774d4a8fe84a54243af5de/trwamtv-live-ch1.mpd
 #EXTINF:-1 tvg-id="TVTrwam.pl",TV Trwam (576p)
 https://trwamtv.cf.insyscd.net/trwamtv.live/live/eds/tv-trwam/hls_fta/tv-trwam.m3u8
-#EXTINF:-1 tvg-id="",TVMN (1080p)
+#EXTINF:-1 tvg-id="TVMN.pl",TVMN (1080p)
 https://r.e.blueonline.tv/nb/videokadrabr/live1/playlist.m3u8
 #EXTINF:-1 tvg-id="TVP2.pl",TVP2 (1080p)
 https://ec04-waw4.cache.orange.pl/dai4/org2/vb/105/tvp2hd/index.m3u8
@@ -97,3 +93,7 @@ https://cdndai.pl/tvp3wroclawsd/index.m3u8
 https://live.streamtvt.pl/LiveAppStreamTVT/streams/853271271313930867905724.m3u8
 #EXTINF:-1 tvg-id="TVTZgorzelec.pl",TVT Zgorzelec (576p) [Not 24/7]
 http://gargoyle.tomkow.pl/hls/tvt.m3u8
+#EXTINF:-1 tvg-id="TV4.pl" tvg-shift="3 minutes",TV4 (1080p) [Geo-blocked]
+https://lb2-e2-32.pluscdn.pl/ch/1502601/309/dash/e25c2c93/live.mpd
+#EXTINF:-1 tvg-id="Polsat.pl" tvg-shift="3 minutes",Polsat (1080p) [Geo-blocked]
+https://lb2-e2-19.pluscdn.pl/ch/1502600/308/dash/20a18c30/live.mpd
diff --git a/streams/pr.m3u b/streams/pr.m3u
index 6b09c1ce2..c9a1d7686 100644
--- a/streams/pr.m3u
+++ b/streams/pr.m3u
@@ -1,15 +1,15 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ACSNetwork.pr",ACS Network (480p)
 https://5790d294af2dc.streamlock.net/acsnetwork/acsnetwork/playlist.m3u8
-#EXTINF:-1 tvg-id="AmericaTeVe.pr",América TeVé (1080p)
-https://live.gideo.video/americateve2/master.m3u8
 #EXTINF:-1 tvg-id="AmericaTeVe.pr",América TeVé (720p)
 https://tgn2.bozztv.com/americateve/americateve1/americateve--1/playlist.m3u8
+#EXTINF:-1 tvg-id="AmericaTeVe.pr",América TeVé (1080p)
+https://live.gideo.video/americateve2/master.m3u8
 #EXTINF:-1 tvg-id="BuenaTV.pr",Buena TV (1080p)
 https://59825a54e4454.streamlock.net:8443/papo351/papo351/playlist.m3u8
-#EXTINF:-1 tvg-id="",Candelita TV (480p)
+#EXTINF:-1 tvg-id="CandelitaTV.pr",Candelita TV (480p)
 https://6110f70ea8d0e.streamlock.net/1689/1689/playlist.m3u8
-#EXTINF:-1 tvg-id="",Caribbean Advantage TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="CAtv.pr",Caribbean Advantage TV (1080p) [Not 24/7]
 https://video2.getstreamhosting.com:19360/8216/8216.m3u8
 #EXTINF:-1 tvg-id="CDMInternacional.pr",CDM Internacional (480p) [Not 24/7]
 https://59825a54e4454.streamlock.net:8443/marcos536/marcos536/playlist.m3u8
@@ -17,7 +17,7 @@ https://59825a54e4454.streamlock.net:8443/marcos536/marcos536/playlist.m3u8
 https://video1.getstreamhosting.com:1936/8226/8226/playlist.m3u8
 #EXTINF:-1 tvg-id="DNJTV.pr",DNJ TV (720p)
 https://eu1.servers10.com:8081/wegqaafnsa/index.m3u8
-#EXTINF:-1 tvg-id="",EBN Televisión (720p)
+#EXTINF:-1 tvg-id="EBNTelevision.pr",EBN Televisión (720p)
 https://627bb251f23c7.streamlock.net:444/EBNTELEVISION/EBNTELEVISION/playlist.m3u8
 #EXTINF:-1 tvg-id="FarodeSantidadTV.pr",Faro de Santidad TV (720p)
 https://5dbcd1053301e.streamlock.net:4443/farodesantidad/farodesantidad/playlist.m3u8
@@ -25,7 +25,7 @@ https://5dbcd1053301e.streamlock.net:4443/farodesantidad/farodesantidad/playlist
 https://stream.eleden.com/livelax/ngrp:livelax_all/playlist.m3u8
 #EXTINF:-1 tvg-id="MasterVideo.pr",Master Video (1080p)
 https://5fd5567570c0e.streamlock.net/222/stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",NG Radio TV (360p)
+#EXTINF:-1 tvg-id="NGRadioTV.pr",NG Radio TV (360p)
 https://5cb1ee4d59ac0.streamlock.net/ngradiotv/ngradiotv/playlist.m3u8
 #EXTINF:-1 tvg-id="NotiUnoTV.pr",NotiUno TV (854p) [Not 24/7]
 https://59a564764e2b6.streamlock.net/notiunotv/notiunotv/playlist.m3u8
diff --git a/streams/pt.m3u b/streams/pt.m3u
index 410a446c4..a1a477151 100644
--- a/streams/pt.m3u
+++ b/streams/pt.m3u
@@ -23,7 +23,7 @@ https://w2.manasat.com/iglesia-online/smil:iglesia-online.smil/playlist.m3u8
 https://w1.manasat.com/igrejaonline/smil:igrejaonline.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ManaTserkovOnlayn.pt",Maná Tserkov' Onlayn (1080p) [Not 24/7]
 https://w2.manasat.com/tserkov-online/smil:tserkov-online.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",NPC Rádio e TV (720p)
+#EXTINF:-1 tvg-id="NPCRadioeTV.pt",NPC Rádio e TV (720p)
 https://stmv5.samcast.com.br/nasciparacantartv/nasciparacantartv/playlist.m3u8
 #EXTINF:-1 tvg-id="ONFM.pt",ON FM (720p)
 https://5ce9406b73c33.streamlock.net/ONFM/livestream/playlist.m3u8
@@ -33,7 +33,7 @@ https://bcovlive-a.akamaihd.net/34ec8f209dcc48dda853aca054c97ab2/eu-west-1/64158
 https://streamer-a01.videos.sapo.pt/live/radiosinesdireto/index.m3u8
 #EXTINF:-1 tvg-id="RecordTVEuropa.pt",RecordTV Europa (720p) [Geo-blocked]
 https://live-recordeuropa.visioncdn.com/live/recordeuropa/master.m3u8
-#EXTINF:-1 tvg-id="",RFPtv (360p)
+#EXTINF:-1 tvg-id="RFPtv.pt",RFPtv (360p)
 https://video03.logicahost.com.br/rfptv/rfptv/playlist.m3u8
 #EXTINF:-1 tvg-id="RTP1.pt" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0",RTP 1 (720p) [Not 24/7]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0
@@ -97,10 +97,10 @@ https://w1.manasat.com/tvmana-leste/smil:tvmana-leste.smil/playlist.m3u8
 https://video-auth4.iol.pt/live_tvi_africa/live_tvi_africa/edge_servers/tviafrica-480p/playlist.m3u8
 #EXTINF:-1 tvg-id="TVIReality.pt",TVI Reality (720p) [Not 24/7]
 https://video-auth4.iol.pt/live_tvi_reality/live_tvi_reality/edge_servers/tvireality-720_passthrough/playlist.m3u8
-#EXTINF:-1 tvg-id="",V+ TVI (720p) [Not 24/7]
-https://video-auth2.iol.pt/live_tvi_ficcao/live_tvi_ficcao/edge_servers/tvificcao-720p/playlist.m3u8
-#EXTINF:-1 tvg-id="",V+ TVI (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="VPlusTVI.pt",V+ TVI (720p) [Not 24/7]
 https://video-auth2.iol.pt/live_vmais/live_vmais/edge_servers/vmais-720p/playlist.m3u8
+#EXTINF:-1 tvg-id="VPlusTVI.pt",V+ TVI (720p) [Not 24/7]
+https://video-auth2.iol.pt/live_tvi_ficcao/live_tvi_ficcao/edge_servers/tvificcao-720p/playlist.m3u8
 #EXTINF:-1 tvg-id="WayTV.pt",Way TV (1080p)
 http://213.13.26.11:1935/live/sobrenaturaltv/livestream.m3u8
 #EXTINF:-1 tvg-id="WEBTVPaixaoFM.pt",WEB TV Paixão FM (360p) [Not 24/7]
diff --git a/streams/pt_samsung.m3u b/streams/pt_samsung.m3u
index 5dba61259..1f4c80417 100644
--- a/streams/pt_samsung.m3u
+++ b/streams/pt_samsung.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Africanews
+#EXTINF:-1 tvg-id="AfricanewsEnglish.fr",Africanews
 https://rakuten-africanews-1-pt.samsung.wurl.tv/manifest/playlist.m3u8
 #EXTINF:-1 tvg-id="BloombergQuicktake.us",Bloomberg Quicktake (1080p)
 https://bloomberg-quicktake-1-pt.samsung.wurl.tv/manifest/playlist.m3u8
diff --git a/streams/py.m3u b/streams/py.m3u
index fc728f8be..d2563dc83 100644
--- a/streams/py.m3u
+++ b/streams/py.m3u
@@ -5,25 +5,25 @@ https://rds3.desdeparaguay.net/4dmasnoticiastv/4dmasnoticiastv/playlist.m3u8
 https://d2e809bgs49c6y.cloudfront.net/live/d87c2b7b-9ecf-4e6e-b63b-b32772bd7851/live.isml/d87c2b7b-9ecf-4e6e-b63b-b32772bd7851.m3u8
 #EXTINF:-1 tvg-id="AlmayaTV.py",Almaya TV (720p)
 https://59ce1298bfb98.streamlock.net/almayatv/almayatv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Artigas TV Online (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="ArtigasTVOnline.py",Artigas TV Online (480p) [Not 24/7]
 https://ssh101.bozztv.com/ssh101/artigastv/playlist.m3u8
 #EXTINF:-1 tvg-id="BrunoMasiTV.py",Bruno Masi TV (720p)
 https://rds3.desdeparaguay.net/brunomasitv/brunomasitv/playlist.m3u8
 #EXTINF:-1 tvg-id="C9N.py",C9N
 https://alba-py-c9n-c9n.stream.mediatiquestream.com/playlist.m3u8
-#EXTINF:-1 tvg-id="",Campo 9 Online (720p)
+#EXTINF:-1 tvg-id="Campo9Online.py",Campo 9 Online (720p)
 https://59ce1298bfb98.streamlock.net/campo9tv/campo9tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 8 C&C Producciones (720p)
+#EXTINF:-1 tvg-id="Canal8CCProducciones.py",Canal 8 C&C Producciones (720p)
 https://59ce1298bfb98.streamlock.net/canal8tv/canal8tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal 11 Damoa TV Regional (900p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal11DamoaTVRegional.py",Canal 11 Damoa TV Regional (900p) [Not 24/7]
 https://59ce1298bfb98.streamlock.net/damoatv/damoatv/playlist.m3u8
 #EXTINF:-1 tvg-id="CaritasTV.py",Cáritas TV (1080p)
 https://rds3.desdeparaguay.net/caritastv/caritastv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Causa Común TV (614p)
+#EXTINF:-1 tvg-id="CausaComunTV.py",Causa Común TV (614p)
 https://cageu.bozztv.com/ssh101/ssh101/causacomuntv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Dismar Radio TV (720p)
+#EXTINF:-1 tvg-id="DismarRadioTV.py",Dismar Radio TV (720p)
 https://rds3.desdeparaguay.net/dismartv/dismartv/playlist.m3u8
-#EXTINF:-1 tvg-id="",DMpy (720p)
+#EXTINF:-1 tvg-id="DMpy.py",DMpy (720p)
 https://59ce1298bfb98.streamlock.net/digitalmediapy/digitalmediapy/playlist.m3u8
 #EXTINF:-1 tvg-id="Educanal.py",Educanal (720p) [Not 24/7]
 https://59ce1298bfb98.streamlock.net/educanal/educanal/playlist.m3u8
@@ -41,7 +41,7 @@ https://tv.invasivamedia.com/hls/limtv.m3u8
 https://59ce1298bfb98.streamlock.net/mastv/mastv/playlist.m3u8
 #EXTINF:-1 tvg-id="MegaTV.py",Mega TV (720p) [Not 24/7]
 https://ott3.streann.com/loadbalancer/services/public/channels-secure/5e62b96e2cdcfac2dd8885dd/playlist.m3u8
-#EXTINF:-1 tvg-id="",Misión TV Digital (720p)
+#EXTINF:-1 tvg-id="MisionTVDigital.py",Misión TV Digital (720p)
 https://ssh101.bozztv.com/ssh101/visionhdtv/playlist.m3u8
 #EXTINF:-1 tvg-id="MiTV.py",MiTV (720p)
 https://rds3.desdeparaguay.net/mitv/mitv/playlist.m3u8
@@ -49,43 +49,43 @@ https://rds3.desdeparaguay.net/mitv/mitv/playlist.m3u8
 https://59ce1298bfb98.streamlock.net/motorsur/motorsur/playlist.m3u8
 #EXTINF:-1 tvg-id="Nanduti.py",Ñanduti TV (720p)
 https://tvdatta.com:3839/live/nandutitvlive.m3u8
-#EXTINF:-1 tvg-id="",Ñemby Noticias HD (720p)
+#EXTINF:-1 tvg-id="NembyNoticiasHD.py",Ñemby Noticias HD (720p)
 https://rpn3.bozztv.com/ssh101/ssh101/streaminghd/playlist.m3u8
 #EXTINF:-1 tvg-id="NextHD.py",Next HD (480p)
 https://live.enhdtv.com:19360/nexthd/nexthd.m3u8
-#EXTINF:-1 tvg-id="",Nihon Gakko TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="NihonGakkoTV.py",Nihon Gakko TV (720p) [Not 24/7]
 https://59ce1298bfb98.streamlock.net/ngtv/ngtv/playlist.m3u8
 #EXTINF:-1 tvg-id="ObediraTV.py",Obedira TV (720p)
 https://59ce1298bfb98.streamlock.net/obediratv/obediratv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Occidental TV (1080p)
+#EXTINF:-1 tvg-id="OccidentalTV.py",Occidental TV (1080p)
 https://59ce1298bfb98.streamlock.net/occidentaltv/occidentaltv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Oviedo Press TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="OviedoPressTV.py",Oviedo Press TV (480p) [Not 24/7]
 https://ssh101.bozztv.com/ssh101/oviedotv/playlist.m3u8
 #EXTINF:-1 tvg-id="OviedoTV.py",Oviedo TV (720p) [Not 24/7]
 https://59ce1298bfb98.streamlock.net/oviedotv/oviedotv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Panambi Digital TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="PanambiDigitalTV.py",Panambi Digital TV (480p) [Not 24/7]
 https://59ce1298bfb98.streamlock.net/panambi/panambi/playlist.m3u8
-#EXTINF:-1 tvg-id="",PDS Radio-TV Digital (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PDSRadioTVDigital.py",PDS Radio-TV Digital (720p) [Not 24/7]
 https://59ce1298bfb98.streamlock.net/pdstv/pdstv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Caazapá Poty 98.1 FM (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadioCaazapaPoty981FM.py",Radio Caazapá Poty 98.1 FM (480p) [Not 24/7]
 https://ssh101.bozztv.com/ssh101/caazapapotytv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Ciudad 98.9 FM TV (720p)
+#EXTINF:-1 tvg-id="RadioCiudad989FMTV.py",Radio Ciudad 98.9 FM TV (720p)
 https://59ce1298bfb98.streamlock.net/ciudadfm/ciudadfm/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Coop Online (576p)
+#EXTINF:-1 tvg-id="RadioCoopOnline.py",Radio Coop Online (576p)
 https://59ce1298bfb98.streamlock.net/cooptv/cooptv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio Pykasú TV (720p)
+#EXTINF:-1 tvg-id="RadioPykasuTV.py",Radio Pykasú TV (720p)
 https://59ce1298bfb98.streamlock.net/pykasutv/pykasutv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Radio San Roque FM 87.5 (480p)
+#EXTINF:-1 tvg-id="RadioSanRoqueFM875.py",Radio San Roque FM 87.5 (480p)
 https://rpn3.bozztv.com/ssh101/ssh101/sanroquearegua/playlist.m3u8
 #EXTINF:-1 tvg-id="RCCTV.py",RCC TV (720p)
 https://59ce1298bfb98.streamlock.net/rcctv02/rcctv02/playlist.m3u8
-#EXTINF:-1 tvg-id="",Red Digital (900p)
+#EXTINF:-1 tvg-id="RedDigital.py",Red Digital (900p)
 https://59ce1298bfb98.streamlock.net/reddigital/reddigital/playlist.m3u8
 #EXTINF:-1 tvg-id="RepublicaTV.py",República TV (720p)
 https://rds3.desdeparaguay.net/republicatv/republicatv/playlist.m3u8
 #EXTINF:-1 tvg-id="RTV12.py",RTV 12 (720p)
 https://59ce1298bfb98.streamlock.net/mediosenpy/mediosenpy/playlist.m3u8
-#EXTINF:-1 tvg-id="",Salto TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SaltoTV.py",Salto TV (1080p) [Not 24/7]
 https://ssh101.bozztv.com/ssh101/redcanindeyu/playlist.m3u8
 #EXTINF:-1 tvg-id="SNT.py",SNT (480p)
 https://alba-py-snt-snt.stream.mediatiquestream.com/tracks-v2a1/mono.m3u8
@@ -93,27 +93,27 @@ https://alba-py-snt-snt.stream.mediatiquestream.com/tracks-v2a1/mono.m3u8
 https://59ce1298bfb98.streamlock.net/somosdeleste/somosdeleste/playlist.m3u8
 #EXTINF:-1 tvg-id="SucesoTV.py",Suceso TV (720p)
 https://59ce1298bfb98.streamlock.net/sucesotv/sucesotv/playlist.m3u8
-#EXTINF:-1 tvg-id="",TeleCanal 50 (1080p)
+#EXTINF:-1 tvg-id="TeleCanal50.py",TeleCanal 50 (1080p)
 https://59ce1298bfb98.streamlock.net/canal50/canal50/playlist.m3u8
-#EXTINF:-1 tvg-id="",TelePortal Canal 53.1 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TelePortalCanal531.py",TelePortal Canal 53.1 (720p) [Not 24/7]
 https://rpn3.bozztv.com/ssh101/ssh101/teleportal/playlist.m3u8
 #EXTINF:-1 tvg-id="Trece.py",Trece Paraguay (1080p) [Not 24/7]
 https://rds3gen.desdeparaguay.net/trecetv/trecetv_alta/playlist.m3u8
 #EXTINF:-1 tvg-id="TVAire.py",TV Aire (720p)
 https://59ce1298bfb98.streamlock.net/tvaire/tvaire/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV Lambaré (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVLambare.py",TV Lambaré (720p) [Not 24/7]
 https://59ce1298bfb98.streamlock.net/tvlambare/tvlambare/playlist.m3u8
 #EXTINF:-1 tvg-id="TVSEncarnacion.py",TVS Encarnación (720p)
 https://rds3gen.desdeparaguay.net/tvs/tvs/playlist.m3u8
 #EXTINF:-1 tvg-id="Unicanal.py",Unicanal (1080p) [Not 24/7]
 https://rds3gen.desdeparaguay.net/unicanal/unicanal_alta/playlist.m3u8
-#EXTINF:-1 tvg-id="",UnionTV
+#EXTINF:-1 tvg-id="UnionTV.py",UnionTV
 https://tigocloud.desdeparaguay.net/800tv/800tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",UniRadio TV (720p)
+#EXTINF:-1 tvg-id="UniRadioTV.py",UniRadio TV (720p)
 https://59ce1298bfb98.streamlock.net/uniradiotv/uniradiotv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Urbano Radio TV 96.5 (720p)
+#EXTINF:-1 tvg-id="UrbanoRadioTV965.py",Urbano Radio TV 96.5 (720p)
 https://rpn3.bozztv.com/ssh101/ssh101/urbanoradiotv96/playlist.m3u8
 #EXTINF:-1 tvg-id="VenusMedia.py",Venus Media (720p)
 https://rds3gen.desdeparaguay.net/venusmedia/venusmedia/.m3u8
-#EXTINF:-1 tvg-id="",Villa Elisa Radio TV (720p)
+#EXTINF:-1 tvg-id="VillaElisaRadioTV.py",Villa Elisa Radio TV (720p)
 https://59ce1298bfb98.streamlock.net/villaelisa/villaelisa/playlist.m3u8
diff --git a/streams/qa.m3u b/streams/qa.m3u
index fc84faf0a..ab0398e33 100644
--- a/streams/qa.m3u
+++ b/streams/qa.m3u
@@ -19,13 +19,13 @@ https://live-hls-web-ajm.getaj.net/AJM/index.m3u8
 https://alrayyancdn.vidgyor.com/pub-noalrayy3pwz0l/liveabr/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="AlRayyanOldTV.qa",Al Rayyan Al Qadeem (1080p)
 https://alrayyancdn.vidgyor.com/pub-nooldraybinbdh/liveabr/playlist_dvr.m3u8
-#EXTINF:-1 tvg-id="",Alaraby 2 TV (1080p)
+#EXTINF:-1 tvg-id="AlArabyTV2.qa",Alaraby 2 TV (1080p)
 https://alaraby.cdn.octivid.com/alaraby2n/smil:alaraby2n.stream.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="",Alaraby 2 TV (1080p)
+#EXTINF:-1 tvg-id="AlArabyTV2.qa",Alaraby 2 TV (1080p)
 https://origin-cae-t482536.cdn.nextologies.com/63d8c759c5db83b4/25c4f89d27a79014ALA2306/playlist.m3u8
-#EXTINF:-1 tvg-id="",Alaraby TV (1080p)
+#EXTINF:-1 tvg-id="AlArabyTV.qa",Alaraby TV (1080p)
 https://alaraby.cdn.octivid.com/alaraby/smil:alaraby.stream.smil/chunklist.m3u8
-#EXTINF:-1 tvg-id="",Alaraby TV (1080p)
+#EXTINF:-1 tvg-id="AlArabyTV.qa",Alaraby TV (1080p)
 https://origin-cae-t482536.cdn.nextologies.com/6837800d47c40cb2/1544c5accd8e84d5ALA2306/playlist.m3u8
 #EXTINF:-1 tvg-id="QatarTelevision.qa",Qatar Television (720p)
 https://qatartv.akamaized.net/hls/live/2026573/qtv1/master.m3u8
diff --git a/streams/ro.m3u b/streams/ro.m3u
index b3c533344..1d6bf8237 100644
--- a/streams/ro.m3u
+++ b/streams/ro.m3u
@@ -41,7 +41,7 @@ https://shls-live-ak.akamaized.net/out/v1/fb7b452f58f2412a9ae26b22dd30bd6b/index
 http://46.4.14.12:9999/btvsvlive/playlist.m3u8
 #EXTINF:-1 tvg-id="CardioTVSRC.ro",Cardio TV SRC (720p)
 https://5947cbf6e693a.streamlock.net/live/play2/playlist.m3u8
-#EXTINF:-1 tvg-id="",CaTine (720p)
+#EXTINF:-1 tvg-id="CaTine.ro",CaTine (720p)
 https://stream1.antenaplay.ro/live/CaTine/playlist.m3u8
 #EXTINF:-1 tvg-id="ColumnaTV.ro",Columna TV (720p)
 http://live.columnatv.ro:1935/columnatv/live/playlist.m3u8
@@ -235,7 +235,7 @@ https://tvr-tvri.cdn.zitec.com/live/tvri/main.m3u8
 #EXTVLCOPT:http-referrer=https://www.tvrplus.ro/
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; rv:126.0) Gecko/20100101 Firefox/126.0
 https://tvr-tvrmoldova.cdn.zitec.com/live/tvrmoldova/main.m3u8
-#EXTINF:-1 tvg-id="" user-agent="Mozilla/5.0 (Windows NT 10.0; rv:126.0) Gecko/20100101 Firefox/126.0",TVR Sport (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="TVRSport.ro" user-agent="Mozilla/5.0 (Windows NT 10.0; rv:126.0) Gecko/20100101 Firefox/126.0",TVR Sport (1080p) [Geo-blocked]
 #EXTVLCOPT:http-referrer=https://www.tvrplus.ro/
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; rv:126.0) Gecko/20100101 Firefox/126.0
 https://tvr-tvrsport.cdn.zitec.com/live/tvrsport/main.m3u8
diff --git a/streams/ru.m3u b/streams/ru.m3u
index 9174750c1..388f1f176 100644
--- a/streams/ru.m3u
+++ b/streams/ru.m3u
@@ -13,7 +13,7 @@ http://89.111.136.7:8080/index.m3u8
 http://dancehits80.denvs.ru:8080/index.m3u8
 #EXTINF:-1 tvg-id="Kino24.ru",Kino 24
 http://sirius.greenhosting.ru/Kino24Ru/video.m3u8
-#EXTINF:-1 tvg-id="",Kulinar TV Show
+#EXTINF:-1 tvg-id="KulinarHD.ru",Kulinar TV Show
 https://api.alpaca.t62a.com/hls/9110/index.m3u8
 #EXTINF:-1 tvg-id="MosObrTV.ru",MOSOBR.TV (720p)
 http://retj.educom.ru/mosobrtv/tv1/index.m3u8
@@ -29,7 +29,7 @@ https://hls-03-video.webcaramba.com/rutv/live.m3u8
 http://serv30.vintera.tv:8081/shoppinglive/shoppinglive_stream/playlist.m3u8
 #EXTINF:-1 tvg-id="Sochi24.ru",Sochi 24 HD
 http://serv30.vintera.tv:8081/sochi/sochi24_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Sochi Live HD (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="SochiLiveHD.ru",Sochi Live HD (720p) [Not 24/7]
 http://serv30.vintera.tv:8081/sochi/sochi_stream/playlist.m3u8
 #EXTINF:-1 tvg-id="SONGTVRussia.ru",SONGTV Russia (720p)
 https://songtv.hls.iptvdc.com/web-russia/index.m3u8
@@ -37,7 +37,7 @@ https://songtv.hls.iptvdc.com/web-russia/index.m3u8
 http://trk555.tv:8888/live
 #EXTINF:-1 tvg-id="TVBRICSRussian.ru",TV BRICS Russian (1080p)
 http://brics.bonus-tv.ru/cdn/brics/russian/playlist.m3u8
-#EXTINF:-1 tvg-id="",Tvoe TV HD
+#EXTINF:-1 tvg-id="TvoeTV.ru",Tvoe TV HD
 http://tvoetv.space:8080/tvoetv/index.m3u8
 #EXTINF:-1 tvg-id="UniverTV.ru",Univer TV (1080p)
 https://cdn.universmotri.ru/live/smil:univer.smil/playlist.m3u8
@@ -113,7 +113,7 @@ http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8
 http://46.46.143.222:1935/live/mp4:ldpr.stream_720p/playlist.m3u8
 #EXTINF:-1 tvg-id="LDPRTV.ru",ЛДПР ТВ (480p)
 http://46.46.143.222:1935/live/mp4:ldpr.stream_480p/playlist.m3u8
-#EXTINF:-1 tvg-id="",Легендарный 24
+#EXTINF:-1 tvg-id="Legendarnyy24.ru",Легендарный 24
 https://sevas.1tvcrimea.ru/legendarniy24.m3u8
 #EXTINF:-1 tvg-id="MaturTV.ru",Матур ТВ (1080p)
 https://public.streaming.matur-tv.ru/hls/h264_aac/stream.m3u8
@@ -157,7 +157,7 @@ https://live-nikatv.cdnvideo.ru/nikatv/nikatv.sdp/playlist.m3u8
 https://live-ntm13.cdnvideo.ru/ntm13/smil:ntm13.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="NTS.ru",НТС (Севастополь) (1080p) [Not 24/7]
 https://peqk71plnjy.a.trbcdn.net/livemaster/w4kz7pki62_nts_tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",ОСН
+#EXTINF:-1 tvg-id="OSN.ru",ОСН
 http://osnmedia.servicecdn.ru/streams/17603_88089/playlist.m3u8
 #EXTINF:-1 tvg-id="OstrosyuzhetnoyeHD.ru",Остросюжетное HD
 http://213.172.73.133:8081/nimble_live/9009_Остросюжетное_HD/playlist.m3u8
@@ -211,7 +211,7 @@ http://sochinskayatrk.ru/hdtv/hls/strc_hd/playlist.m3u8
 https://video1.in-news.ru/c24/index.m3u8
 #EXTINF:-1 tvg-id="TVK.ru",ТВК 24 (576p)
 https://air.tvk6.ru/tvk24/playlist.m3u8
-#EXTINF:-1 tvg-id="",Твое ТВ Юмор
+#EXTINF:-1 tvg-id="TvoyeTVYumor.ru",Твое ТВ Юмор
 http://tvoetv.space:8080/tvoetv_humor/index.m3u8
 #EXTINF:-1 tvg-id="86.ru",Телеканал 86 (Сургут) (1080p) [Not 24/7]
 https://sitv.ru/hls/s86.m3u8
@@ -223,7 +223,7 @@ http://tvcom.stream.intelema.ru/tvcom/studio/playlist.m3u8
 https://stream.almaz-media.tv:8080/hls/576.m3u8
 #EXTINF:-1 tvg-id="TKR.ru",ТКР (Рязань) (1080p) [Not 24/7]
 http://live.tkr.cdnvideo.ru/tkr/tkr.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",Толк HD
+#EXTINF:-1 tvg-id="TolkHD.ru",Толк HD
 http://live-tolknews.cdnvideo.ru/tolknews/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TochkaTV.ru",Точка ТВ
 https://tochkatv-live.cdnvideo.ru/tochkatv2/tochkatv-sd.stream/playlist.m3u8
@@ -231,7 +231,7 @@ https://tochkatv-live.cdnvideo.ru/tochkatv2/tochkatv-sd.stream/playlist.m3u8
 https://hls.tv.3angels.ru/stream.m3u8
 #EXTINF:-1 tvg-id="HuzurTV.ru",Хузур ТВ (1080p) [Not 24/7]
 https://hls-mycdn08724960135.cdnvideo.ru/mycdn08724960135/stream1/playlist.m3u8
-#EXTINF:-1 tvg-id="",Центр (Красноярск)
+#EXTINF:-1 tvg-id="TsentrKrasnoyarsk.ru",Центр (Красноярск)
 https://stream.tck.tv/hd.m3u8
 #EXTINF:-1 tvg-id="ShansonTV.ru",Шансон ТВ (576p) [Geo-blocked]
 https://uiptv.do.am/1ufc/602079679/playlist.m3u8
diff --git a/streams/ru_smotrim.m3u b/streams/ru_smotrim.m3u
index 0217236cb..fa84c79e5 100644
--- a/streams/ru_smotrim.m3u
+++ b/streams/ru_smotrim.m3u
@@ -55,7 +55,7 @@ https://sitv.ru/vgtrk/stv.m3u8
 https://live-tvkrasnodar.cdnvideo.ru/tvkrasnodar/tvkrasnodar.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="TNTMusic.ru",ТНТ Music
 https://tntmsmotr.mediacdn.ru/cdn/smotr/playlist.m3u8
-#EXTINF:-1 tvg-id="",Толк
+#EXTINF:-1 tvg-id="TolkHD.ru",Толк
 https://live-tolknews.cdnvideo.ru/tolknews/stream/playlist.m3u8
 #EXTINF:-1 tvg-id="",Урал 24 (Челябинск)
 https://vgtrkregion-reg.cdnvideo.ru/vgtrk/chelyabinsk/russia1-hd/index.m3u8
diff --git a/streams/rw.m3u b/streams/rw.m3u
index ea5df52f3..78cccdf4a 100644
--- a/streams/rw.m3u
+++ b/streams/rw.m3u
@@ -1,10 +1,6 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="BPlusTV.rw",B+ TV
-https://tv.btnrwanda.com:3432/live/bpluslive.m3u8
 #EXTINF:-1 tvg-id="BPlusTV.rw",B+ TV (576p) [Not 24/7]
 https://tv.livebcm.com:3596/live/bplustvrwandalive.m3u8
-#EXTINF:-1 tvg-id="BTNTV.rw",BTN TV
-https://tv.btnrwanda.com:3086/live/btnlive.m3u8
 #EXTINF:-1 tvg-id="BTNTV.rw",BTN TV [Not 24/7]
 https://vdo6.instainternet.com:3276/live/octavebtntvlive.m3u8
 #EXTINF:-1 tvg-id="BTNTV.rw",BTN TV (576p) [Not 24/7]
@@ -29,3 +25,7 @@ http://197.243.19.131:1935/rtv/rtv/chunklist.m3u8
 http://197.243.19.131:1935/rtv/rtv/chunklist_w2093872577.m3u8
 #EXTINF:-1 tvg-id="RwandaTV.rw",RTV Rwanda (480p) [Not 24/7]
 https://5c46fa289c89f.streamlock.net/rtv/rtv/playlist.m3u8
+#EXTINF:-1 tvg-id="BTNTV.rw",BTN TV
+https://tv.btnrwanda.com:3086/live/btnlive.m3u8
+#EXTINF:-1 tvg-id="BPlusTV.rw",B+ TV
+https://tv.btnrwanda.com:3432/live/bpluslive.m3u8
diff --git a/streams/sa.m3u b/streams/sa.m3u
index ad0e9d039..f18d27dcb 100644
--- a/streams/sa.m3u
+++ b/streams/sa.m3u
@@ -1,15 +1,15 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="AhlAlquranTV.sa",Ahl-Alquran TV (360p)
 https://al-ekhbaria-prod-dub.shahid.net/out/v1/9885cab0a3ec4008b53bae57a27ca76b/index.m3u8
-#EXTINF:-1 tvg-id="",Al Arabiya Al Hadath (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlHadath.sa",Al Arabiya Al Hadath (1080p) [Not 24/7]
 https://av.alarabiya.net/alarabiapublish/alhadath.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlEkhbariya.sa",Al Ekhbariya (1080p)
 https://al-ekhbaria-prod-dub.shahid.net/out/v1/d443f3203b444032896e3233cb6eaa84/index.m3u8
 #EXTINF:-1 tvg-id="AlEkhbariya.sa",Al Ekhbariya (1080p) [Not 24/7]
 https://edge.taghtia.com/sa/4.m3u8
-#EXTINF:-1 tvg-id="",Al Hadath TV (1080p)
+#EXTINF:-1 tvg-id="AlHadath.sa",Al Hadath TV (1080p)
 https://shls-hadath-prod-dub.shahid.net/out/v1/0e1a306399c346faac4226aa0858f99b/index.m3u8
-#EXTINF:-1 tvg-id="",Al Hadath TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlHadath.sa",Al Hadath TV (1080p) [Not 24/7]
 https://live.alarabiya.net/alarabiapublish/alhadath.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="AlKhalijTV.sa",Al Khalij (720p) [Not 24/7]
 https://mn-nl.mncdn.com/khalij/khalij/playlist.m3u8
diff --git a/streams/si.m3u b/streams/si.m3u
index 46ec56399..5a3a49811 100644
--- a/streams/si.m3u
+++ b/streams/si.m3u
@@ -7,7 +7,7 @@ https://584943999.r.worldssl.net/584943999/vzivo/playlist.m3u8
 https://cdne.folxplay.tv/folx-trz/streams/ch-5/master.m3u8
 #EXTINF:-1 tvg-id="GTV.si",GTV (360p) [Not 24/7]
 http://91.220.221.60/gtv_hls/gtv_03.m3u8
-#EXTINF:-1 tvg-id="",Radio Aktual (1080p)
+#EXTINF:-1 tvg-id="RadioAktual.si",Radio Aktual (1080p)
 https://vr1.radioaktual.si/hls/stream.m3u8
 #EXTINF:-1 tvg-id="TVSehara.si",Sehara TV (720p)
 http://ip2.xxlservices.com:8081/seharaonline/live/playlist.m3u8
diff --git a/streams/sk.m3u b/streams/sk.m3u
index 8a0a3c271..0ac67de00 100644
--- a/streams/sk.m3u
+++ b/streams/sk.m3u
@@ -23,11 +23,11 @@ https://kamery.kukni.sk:8181/memfs/fb00d981-d2d4-4d69-bb44-a9ff6aa25a76.m3u8
 https://lifetv.mpks.sk/s.m3u8
 #EXTINF:-1 tvg-id="Markiza.sk",Markíza (1080p)
 http://88.212.15.27/live/test_markiza_25p/playlist.m3u8
-#EXTINF:-1 tvg-id="",Markiza Klasik (1080p)
+#EXTINF:-1 tvg-id="MarkizaKlasik.sk",Markiza Klasik (1080p)
 https://cdnsk003.panaccess.com/local/Markiza_Klasik/index.m3u8
 #EXTINF:-1 tvg-id="MarkizaKrimi.sk",Markiza Krimi (1080p)
 https://cdnsk003.panaccess.com/local/Markiza_krimi/index.m3u8
-#EXTINF:-1 tvg-id="",MTR (1080p)
+#EXTINF:-1 tvg-id="MTR.sk",MTR (1080p)
 https://cdnsk003.panaccess.com/local/Ruzomberok/index.m3u8
 #EXTINF:-1 tvg-id="TVRaj.sk",Raj TV (720p) [Not 24/7]
 https://ottst05.flexitv.sk/2827-tv-pc.m3u8
diff --git a/streams/sn.m3u b/streams/sn.m3u
index c39559991..72d16e88b 100644
--- a/streams/sn.m3u
+++ b/streams/sn.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="A2iMusic.sn",A2i Music (720p) [Not 24/7]
 https://stream.sen-gt.com/A2iMusic/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="",A2i Naija (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="A2iNaija.sn",A2i Naija (720p) [Not 24/7]
 https://stream.sen-gt.com/A2iNaija/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="A2iReligion.sn",A2i Religion (720p) [Not 24/7]
 https://stream.sen-gt.com/A2iReligion/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Al Fayda TV (720p)
+#EXTINF:-1 tvg-id="AlFaydaTV.sn",Al Fayda TV (720p)
 https://helga.iptv2022.com/sh/AL_AYDA_TV_DAKAR/index.m3u8
 #EXTINF:-1 tvg-id="AmaniTV.sn",Amani TV (1080p) [Not 24/7]
 https://goccn.cloud/hls/amanitv/index.m3u8
@@ -13,15 +13,15 @@ https://goccn.cloud/hls/amanitv/index.m3u8
 https://endour.net/hls/RUgLAPCbPdF5oPSTX2Hvl/index.m3u8
 #EXTINF:-1 tvg-id="CNMTV.sn",CNM TV (720p) [Not 24/7]
 https://stream.sen-gt.com/cnmtv/myStream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Diama TV (1080p)
+#EXTINF:-1 tvg-id="DiamaTV.sn",Diama TV (1080p)
 https://helga.iptv2022.com/Diama_TV/index.m3u8
-#EXTINF:-1 tvg-id="",Diamaguene TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="DiamagueneTV.sn",Diamaguene TV (480p) [Not 24/7]
 https://helga.iptv2022.com/sh/DIAMAGUENE_TV/index.m3u8
-#EXTINF:-1 tvg-id="",Grand Yoff TV (720p)
+#EXTINF:-1 tvg-id="GrandYoffTV.sn",Grand Yoff TV (720p)
 https://helga.iptv2022.com/sh/Grand_Yoff_TV/index.m3u8
-#EXTINF:-1 tvg-id="",Islam TV Sénégal (720p)
+#EXTINF:-1 tvg-id="IMTV.sn",Islam TV Sénégal (720p)
 https://tv.imediasn.com/hls/live.m3u8
-#EXTINF:-1 tvg-id="",Keur Ndanane TV (720p)
+#EXTINF:-1 tvg-id="KeurNdananeTV.sn",Keur Ndanane TV (720p)
 https://helga.iptv2022.com/sh/KN_TV/index.m3u8
 #EXTINF:-1 tvg-id="LeralTV.sn",Leral TV (480p)
 https://helga.iptv2022.com/sh/Leral/index.m3u8
@@ -31,11 +31,11 @@ https://stream.sen-gt.com/Mbacke/myStream/playlist.m3u8
 https://goccn.cloud/hls/Madertv/index.m3u8
 #EXTINF:-1 tvg-id="MourideTV.sn",Mouride TV (720p)
 http://51.81.109.113:1935/Livemouridetv/mouridetv/playlist.m3u8
-#EXTINF:-1 tvg-id="",One Nation TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="OneNationTV.sn",One Nation TV (720p) [Not 24/7]
 https://endour.net/hls/One_nationtv/index.m3u8
-#EXTINF:-1 tvg-id="",PublicSn TV (720p)
+#EXTINF:-1 tvg-id="PublicSnTV.sn",PublicSn TV (720p)
 https://goccn.cloud/hls/publictv/index.m3u8
-#EXTINF:-1 tvg-id="",Rewmi TV (720p)
+#EXTINF:-1 tvg-id="RewmiTV.sn",Rewmi TV (720p)
 https://mamoch.me/hls/rewmitv/index.m3u8
 #EXTINF:-1 tvg-id="RFM.sn",RFM (720p)
 https://senrtmp.com/hls/rfm.m3u8
@@ -45,9 +45,9 @@ http://69.64.57.208/rts1/playlist.m3u8
 http://69.64.57.208/rts2/playlist.m3u8
 #EXTINF:-1 tvg-id="SenTV.sn",Sen TV (360p)
 http://69.64.57.208/sentv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Seneweb TV (676p) [Not 24/7]
+#EXTINF:-1 tvg-id="SenewebTV.sn",Seneweb TV (676p) [Not 24/7]
 https://helga.iptv2022.com/sh/Sene_Web_Tv/index.m3u8
-#EXTINF:-1 tvg-id="",SenJeunes TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="SenJeunesTV.sn",SenJeunes TV (480p) [Not 24/7]
 https://stream.sen-gt.com/senjeunestv/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="SunuLabelTV.sn",Sunu Label TV (480p) [Not 24/7]
 https://live3.acangroup.org:1929/publiclive/sunulabel/playlist.m3u8
@@ -59,7 +59,7 @@ https://streamspace.live/hls/tempoafrictv/livestream.m3u8
 http://69.64.57.208/tfm/playlist.m3u8
 #EXTINF:-1 tvg-id="TFM.sn",TFM (720p)
 https://raw.githubusercontent.com/azgaresncf/strm2hls/main/streams/TFM.m3u8
-#EXTINF:-1 tvg-id="",TM.tv (360p)
+#EXTINF:-1 tvg-id="TMtv.sn",TM.tv (360p)
 https://helga.iptv2022.com/sh/Tamasheq_TV/index.m3u8
 #EXTINF:-1 tvg-id="WalfTV.sn",Walf TV (360p)
 http://69.64.57.208/walftv/playlist.m3u8
diff --git a/streams/so.m3u b/streams/so.m3u
index 5392fb05b..c1ceeff4b 100644
--- a/streams/so.m3u
+++ b/streams/so.m3u
@@ -1,9 +1,9 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="BulshoTV.so",Bulsho TV
 https://cdn.mediavisionuk.com:9000/bulshotv/index.m3u8
-#EXTINF:-1 tvg-id="",Dacwa TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="DacwaTV.ke",Dacwa TV (576p) [Not 24/7]
 https://ap02.iqplay.tv:8082/iqb8002/d13w1/playlist.m3u8
-#EXTINF:-1 tvg-id="",Hirshabelle TV (576p)
+#EXTINF:-1 tvg-id="HirshabelleTV.so",Hirshabelle TV (576p)
 http://ap02.iqplay.tv:8081/iqb8002/h1rshbe1iptv/playlist.m3u8
 #EXTINF:-1 tvg-id="MMSomaliTV.uk",MM Somali TV (720p)
 https://cdn.mediavisionuk.com:9000/MMTV/index.m3u8
@@ -13,7 +13,7 @@ http://cdn.mediavisionuae.com:1935/live/putlandtv2.stream/playlist.m3u8
 https://ap02.iqplay.tv:8082/iqb8002/s03btv/playlist.m3u8
 #EXTINF:-1 tvg-id="SBCTV.so",SBC TV (720p) [Not 24/7]
 http://cdn.mediavisionuae.com:1935/live/sbctv.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="",SNTV Daljir (576p)
+#EXTINF:-1 tvg-id="SNTVDaljir.so",SNTV Daljir (576p)
 https://ap02.iqplay.tv:8082/iqb8002/s2tve/playlist.m3u8
 #EXTINF:-1 tvg-id="SomaliNationalTV.so",Somali National TV (576p)
 https://ap02.iqplay.tv:8082/iqb8002/s4ne/playlist.m3u8
diff --git a/streams/sr.m3u b/streams/sr.m3u
index 6eec03946..3c84d6659 100644
--- a/streams/sr.m3u
+++ b/streams/sr.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ATV.sr",ATV (1080p) [Not 24/7]
 https://live.suricloud.com/hls/atv1/index.m3u8
-#EXTINF:-1 tvg-id="",ATV 2 (1080p)
+#EXTINF:-1 tvg-id="ATV2.sr",ATV 2 (1080p)
 https://ts.suricloud.com:5443/atvlive/streams/atv2.m3u8
-#EXTINF:-1 tvg-id="",ATV 3 (1080p)
+#EXTINF:-1 tvg-id="ATV3.sr",ATV 3 (1080p)
 https://ts.suricloud.com:5443/atvlive/streams/atv3.m3u8
-#EXTINF:-1 tvg-id="",Shalom TV (360p)
+#EXTINF:-1 tvg-id="ShalomTV.sr",Shalom TV (360p)
 https://media.streambrothers.com:1936/8400/8400/playlist.m3u8
 #EXTINF:-1 tvg-id="TrishulBroadcastingNetwork.sr",TBN TV (720p) [Not 24/7]
 https://live.suricloud.com/hls/tbntv/index.m3u8
diff --git a/streams/sv.m3u b/streams/sv.m3u
index ba75ea7eb..be8f6198c 100644
--- a/streams/sv.m3u
+++ b/streams/sv.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Árbol de Vida TV (240p) [Not 24/7]
+#EXTINF:-1 tvg-id="ArboldeVidaTV.sv",Árbol de Vida TV (240p) [Not 24/7]
 https://www.yupi.live:1936/livearbol/livearbol/playlist.m3u8
 #EXTINF:-1 tvg-id="AwapaSportsTV.sv",Awapa Sports TV (1080p) [Not 24/7]
 https://mgv-awapa.akamaized.net/hls/live/2104282/MGV_CHANNEL15/master.m3u8
 #EXTINF:-1 tvg-id="Canal2.sv",Canal 2 (480p) [Not 24/7]
 https://telecorporacion-es.cdn.vustreams.com/live/d3e259fa-736d-46b0-b1c9-71caf946ace9/live.isml/live.m3u8
-#EXTINF:-1 tvg-id="",Canal 3 Impresionante (480p)
+#EXTINF:-1 tvg-id="Canal3Impresionante.sv",Canal 3 Impresionante (480p)
 https://cloud2.streaminglivehd.com:1936/8048/8048/playlist.m3u8
 #EXTINF:-1 tvg-id="Canal4.sv",Canal 4 (480p)
 http://45.5.116.178:8000/play/a03p/index.m3u8
@@ -21,19 +21,19 @@ https://streaming.grupocsanetwork.com:19360/canal11/canal11.m3u8
 https://alba-sv-c12-c12.stream.mediatiquestream.com/original.m3u8
 #EXTINF:-1 tvg-id="El15TV.sv",Canal 15 Usulután (720p) [Not 24/7]
 https://streaming.grupocsanetwork.com:19360/canal15/canal15.m3u8
-#EXTINF:-1 tvg-id="",Canal 65 (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal65.sv",Canal 65 (1080p) [Not 24/7]
 https://panel.streamingtv-mediacp.online:1936/tv65/tv65/playlist.m3u8
-#EXTINF:-1 tvg-id="",Canal TRV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CanalTRV.sv",Canal TRV (480p) [Not 24/7]
 https://stream.oursnetworktv.com/latin/encoder44/playlist.m3u8
 #EXTINF:-1 tvg-id="ElCaminoTV.sv",El Camino TV (480p)
 https://5d32e2b9b7eed.streamlock.net:4443/ectv/ectv/playlist.m3u8
 #EXTINF:-1 tvg-id="ElimTV.sv",Elim TV (480p)
 https://dacastmmd.mmdlive.lldns.net/dacastmmd/7e84ed301b194b7b81e86f85bb2c3a33/playlist.m3u8
-#EXTINF:-1 tvg-id="",FTV Televisión Familiar (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="FTVTelevisionFamiliar.sv",FTV Televisión Familiar (480p) [Not 24/7]
 https://www.yupi.live:1936/tvftv/tvftv/playlist.m3u8
-#EXTINF:-1 tvg-id="",GSG TV (720p)
+#EXTINF:-1 tvg-id="GSGTV.sv",GSG TV (720p)
 https://schurch1.bozztv.com/livecdn69/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",Josué TV (1080p)
+#EXTINF:-1 tvg-id="JosueTV.sv",Josué TV (1080p)
 https://videoserver.tmcreativos.com:19360/abbftuhxxs/abbftuhxxs.m3u8
 #EXTINF:-1 tvg-id="LegislativeAssemblyofElSalvador.sv",Legislative Assembly of El Salvador (1080p) [Not 24/7]
 https://streaming.asamblea.gob.sv/hls/plenariahd.m3u8
@@ -45,15 +45,15 @@ https://mgv-channel21.akamaized.net/hls/live/2093191/MGV_CHANNEL21/master.m3u8
 https://fl1003.bozztv.com/ssh101/OrbitaFM953/index.m3u8
 #EXTINF:-1 tvg-id="OrbitaTV.sv",Órbita TV (720p)
 https://ssh101.bozztv.com/ssh101/OrbitaTV25/playlist.m3u8
-#EXTINF:-1 tvg-id="",RTV Canal 57 (720p)
+#EXTINF:-1 tvg-id="RTVCanal57.sv",RTV Canal 57 (720p)
 https://streaming.grupocsanetwork.com:19360/canal57/canal57.m3u8
-#EXTINF:-1 tvg-id="",RTV Católica Canal 40 (1080p)
+#EXTINF:-1 tvg-id="RTVCatolica.sv",RTV Católica Canal 40 (1080p)
 https://streaming.grupocsanetwork.com:19360/canal40/canal40.m3u8
 #EXTINF:-1 tvg-id="SolTV.sv",Sol TV Morazán (1080p) [Not 24/7]
 http://rtmp.info:1935/soltv/envivo/playlist.m3u8
 #EXTINF:-1 tvg-id="TaberTV.sv",Taber TV (1080p)
 https://5ca9af4645e15.streamlock.net/tabertv/smil:tabertv.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",TCS+ (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="TCSPlus.sv",TCS+ (480p) [Not 24/7]
 https://telecorporacion.cdn.vustreams.com/live/19b307cf-3f2d-44cb-bce6-0fd65365c56a/live.isml/live.m3u8
 #EXTINF:-1 tvg-id="TigoSports.sv",Tigo Sports TV El Salvador (720p) [Geo-blocked]
 https://channel03.tigosports.com.sv/out/v1/31f36d52d558475ca18799d8ca5e4b40/index.m3u8
@@ -61,11 +61,11 @@ https://channel03.tigosports.com.sv/out/v1/31f36d52d558475ca18799d8ca5e4b40/inde
 https://cloudflare.streamgato.us:3204/live/tribunatvlive.m3u8
 #EXTINF:-1 tvg-id="TVCRET.sv",TV CRET (1080p)
 https://radiocret.net:8082/hls/tvcret.m3u8
-#EXTINF:-1 tvg-id="",TV Getsemaní (720p)
+#EXTINF:-1 tvg-id="TVGetsemani.sv",TV Getsemaní (720p)
 https://serversv.com:8080/hls/tvgetsemani.m3u8
-#EXTINF:-1 tvg-id="",TV León de Judá (720p)
+#EXTINF:-1 tvg-id="TVLeondeJuda.sv",TV León de Judá (720p)
 https://6110f70ea8d0e.streamlock.net/1838/1838/playlist.m3u8
-#EXTINF:-1 tvg-id="",TVC Network (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TVCNetwork.sv",TVC Network (720p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://player.castr.com/live_d0b3cf70e24111ed8ed2951b4c7d1b75
 https://stream.castr.com/643880749cf895435bf8eadf/live_d0b3cf70e24111ed8ed2951b4c7d1b75/index.m3u8
 #EXTINF:-1 tvg-id="TVCa.sv",TVCa Televisión Católica Arquidiocesana (720p)
diff --git a/streams/tg.m3u b/streams/tg.m3u
index 10ce6986c..c364d07df 100644
--- a/streams/tg.m3u
+++ b/streams/tg.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="ACTV.tg",AC TV (480p) [Not 24/7]
 https://ssh101.bozztv.com/ssh101/actvstream/playlist.m3u8
-#EXTINF:-1 tvg-id="",Direct 7 TV (720p)
+#EXTINF:-1 tvg-id="Direct7TV.tg",Direct 7 TV (720p)
 https://helga.iptv2022.com/DIRECT__7/index.m3u8
-#EXTINF:-1 tvg-id="",Dynamic Gospel TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="DynamicGospelTV.tg",Dynamic Gospel TV (480p) [Not 24/7]
 https://ssh101.bozztv.com/ssh101/tvdynamicstream/playlist.m3u8
-#EXTINF:-1 tvg-id="",LNTV (720p)
+#EXTINF:-1 tvg-id="LNTV.tg",LNTV (720p)
 https://helga.iptv2022.com/sh/LNTV/index.m3u8
 #EXTINF:-1 tvg-id="NWEconomie.tg",NW Economie (576p)
 https://hls.newworldtv.com/nw-economie/video/live.m3u8
@@ -15,9 +15,9 @@ https://hls.newworldtv.com/nw-info-2/video/live.m3u8
 https://hls.newworldtv.com/nw-info/video/live.m3u8
 #EXTINF:-1 tvg-id="NWMagazine.tg",NW Magazine (576p)
 https://hls.newworldtv.com/nw-magazine/video/live.m3u8
-#EXTINF:-1 tvg-id="",RT JVA (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RTJVA.tg",RT JVA (720p) [Not 24/7]
 https://cdn140m.panaccess.com/HLS/RTVJA/index.m3u8
-#EXTINF:-1 tvg-id="",SMA Togo TV (720p)
+#EXTINF:-1 tvg-id="SMATogoTV.tg",SMA Togo TV (720p)
 https://smatogo.tv:89/smatogo/smatogo.m3u8
 #EXTINF:-1 tvg-id="SOSDocteurTV.tg",SOS Docteur TV (480p) [Not 24/7]
 https://wmoy82n4y2a7-hls-live.5centscdn.com/sostv/live.stream/playlist.m3u8
diff --git a/streams/tj.m3u b/streams/tj.m3u
index ecb818ceb..6ff782452 100644
--- a/streams/tj.m3u
+++ b/streams/tj.m3u
@@ -5,7 +5,7 @@ https://live.teleradiocom.tj/11/3m.m3u8
 https://live.teleradiocom.tj/7/3m.m3u8
 #EXTINF:-1 tvg-id="Futbol.tj",Futbol (1080p)
 https://live.teleradiocom.tj/8/3m.m3u8
-#EXTINF:-1 tvg-id="",Ilm va Tabiat (1080p)
+#EXTINF:-1 tvg-id="IlmvaTabiat.tj",Ilm va Tabiat (1080p)
 https://live.teleradiocom.tj/15/3m.m3u8
 #EXTINF:-1 tvg-id="Jahonnamo.tj",Jahonnamo (1080p)
 https://live.teleradiocom.tj/4/3m.m3u8
@@ -21,7 +21,7 @@ https://live.teleradiocom.tj/3/3m.m3u8
 https://live.teleradiocom.tj/12/3m.m3u8
 #EXTINF:-1 tvg-id="TVSafina.tj",TV Safina (1080p)
 https://live.teleradiocom.tj/2/3m.m3u8
-#EXTINF:-1 tvg-id="",TV Sayohi (1080p)
+#EXTINF:-1 tvg-id="TVSayohi.tj",TV Sayohi (1080p)
 https://live.teleradiocom.tj/16/3m.m3u8
 #EXTINF:-1 tvg-id="TVSinamo.tj",TV Sinamo (1080p)
 https://live.teleradiocom.tj/6/3m.m3u8
diff --git a/streams/tm.m3u b/streams/tm.m3u
index b57c6cc70..e1e903bc3 100644
--- a/streams/tm.m3u
+++ b/streams/tm.m3u
@@ -3,9 +3,9 @@
 https://alpha.tv.online.tm/hls/ch001.m3u8
 #EXTINF:-1 tvg-id="AltynAsyr.tm",Altyn Asyr (406p) [Not 24/7]
 https://alpha.tv.online.tm/legacyhls/ch001.m3u8
-#EXTINF:-1 tvg-id="",Arkadag TV (406p) [Not 24/7]
+#EXTINF:-1 tvg-id="ArkadagTV.tm",Arkadag TV (406p) [Not 24/7]
 https://alpha.tv.online.tm/hls/ch000.m3u8
-#EXTINF:-1 tvg-id="",Arkadag TV (406p) [Not 24/7]
+#EXTINF:-1 tvg-id="ArkadagTV.tm",Arkadag TV (406p) [Not 24/7]
 https://alpha.tv.online.tm/legacyhls/ch000.m3u8
 #EXTINF:-1 tvg-id="Asgabat.tm",Aşgabat (406p) [Not 24/7]
 https://alpha.tv.online.tm/hls/ch006.m3u8
diff --git a/streams/tr.m3u b/streams/tr.m3u
index 0ba924297..86551fe90 100644
--- a/streams/tr.m3u
+++ b/streams/tr.m3u
@@ -32,7 +32,7 @@ https://api-tv3.yayin.com.tr/postatv/postatv/playlist.m3u8
 http://stream.taksimbilisim.com:1935/altastv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="AltasTV.tr",ALTAŞ TV (720p) [Not 24/7]
 https://edge1.socialsmart.tv/altastv/bant1/index.m3u8
-#EXTINF:-1 tvg-id="",Anadolu Net TV (1080p)
+#EXTINF:-1 tvg-id="AnadoluNetTV.tr",Anadolu Net TV (1080p)
 https://live.artidijitalmedya.com/artidijital_anadolunet/anadolunet/playlist.m3u8
 #EXTINF:-1 tvg-id="ArasTV.tr",ARAS TV (576p) [Not 24/7]
 http://1.rtmp.org/tv217/yayin.stream/playlist.m3u8
@@ -48,7 +48,7 @@ https://s01.vpis.io/besiktas/besiktas.m3u8
 https://mn-nl.mncdn.com/blutv_beyaztv2/live.m3u8
 #EXTINF:-1 tvg-id="BeykentTV.tr",Beykent TV (720p)
 https://yayin30.haber100.com/live/beykenttv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Bir TV (720p)
+#EXTINF:-1 tvg-id="BirTV.tr",Bir TV (720p)
 https://live.artidijitalmedya.com/artidijital_birtv/birtv/playlist.m3u8
 #EXTINF:-1 tvg-id="BizimevTV.tr",Bizimev TV (720p)
 https://mn-nl.mncdn.com/blutv_bizimev/bizimev_sd.smil/playlist.m3u8
@@ -82,7 +82,7 @@ https://cdn-cekmekoybeltv.yayin.com.tr/cekmekoybeltv/cekmekoybeltv_1080p/playlis
 http://stream.taksimbilisim.com:1935/ciftcitv/smil:ciftcitv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CiftciTV.tr",Çiftçi TV (720p) [Not 24/7]
 https://live.artidijitalmedya.com/artidijital_ciftcitv/ciftcitv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Cine 1 (720p)
+#EXTINF:-1 tvg-id="Cine1.tr",Cine 1 (720p)
 https://live.artidijitalmedya.com/artidijital_cine1/cine1/playlist.m3u8
 #EXTINF:-1 tvg-id="Cine5.tr",Cine5 (720p)
 https://cdn-cine5tv.yayin.com.tr/cine5tv/cine5tv/playlist.m3u8
@@ -126,7 +126,7 @@ http://win20.yayin.com.tr/ertsahtv/ertsahtv/playlist.m3u8
 https://win29.yayin.com.tr/erzurumwebtv/erzurumwebtv/iptvdelisi.m3u8
 #EXTINF:-1 tvg-id="ESTV.tr",ES TV (720p)
 https://live.artidijitalmedya.com/artidijital_estv/estv/playlist.m3u8
-#EXTINF:-1 tvg-id="",ETV Kayseri (720p)
+#EXTINF:-1 tvg-id="ETVKayseri.tr",ETV Kayseri (720p)
 https://live.artidijitalmedya.com/artidijital_etv/etv/playlist.m3u8
 #EXTINF:-1 tvg-id="ETVManisa.tr",ETV Manisa (1080p) [Not 24/7]
 https://edge1.socialsmart.tv/manisaetv/bant1/playlist.m3u8
@@ -142,7 +142,7 @@ https://mn-nl.mncdn.com/blutv_flashtv/live.m3u8
 https://fortunacdn.socialsmart.tv/ftvturk/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="GoncaTV.tr",Gonca TV (720p)
 https://edge1.socialsmart.tv/goncatv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="",Grand Cinema
+#EXTINF:-1 tvg-id="GrandCinema.tr",Grand Cinema
 https://gcinemahls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="GRT.tr",GRT (900p)
 https://live.artidijitalmedya.com/artidijital_grt/grt1/playlist.m3u8
@@ -260,7 +260,7 @@ https://live.artidijitalmedya.com/artidijital_kentturktv/kentturktv/playlist.m3u
 https://live.artidijitalmedya.com/artidijital_38kenttv/38kenttv/playlist.m3u8
 #EXTINF:-1 tvg-id="KonTV.tr",Kon TV (720p)
 https://mn-nl.mncdn.com/blutv_kontv2/live.m3u8
-#EXTINF:-1 tvg-id="",Konya Olay TV (720p)
+#EXTINF:-1 tvg-id="KonyaOlayTV.tr",Konya Olay TV (720p)
 https://live.artidijitalmedya.com/artidijital_konyaolaytv/konyaolaytv/playlist.m3u8
 #EXTINF:-1 tvg-id="KralPopTV.tr",KRAL Pop TV (720p)
 https://dogus-live.daioncdn.net/kralpoptv/playlist.m3u8
@@ -294,9 +294,9 @@ https://edge1.socialsmart.tv/muglaturk/bant1/playlist.m3u8
 http://broadcasttr.com:1935/naturaltv/bant1/playlist.m3u8
 #EXTINF:-1 tvg-id="NaturalTV.tr",Natural TV (720p) [Not 24/7]
 https://edge1.socialsmart.tv/naturaltv/bant1/playlist.m3u8
-#EXTINF:-1 tvg-id="",Nora TV (1080p)
+#EXTINF:-1 tvg-id="NoraTV.tr",Nora TV (1080p)
 https://live.artidijitalmedya.com/artidijital_noratv/noratv/playlist.m3u8
-#EXTINF:-1 tvg-id="",NOW TV
+#EXTINF:-1 tvg-id="NOWTV.tr",NOW TV
 http://bozztv.com/gin-trn09/gin-turkfoxtv/tracks-v1a1/mono.m3u8
 #EXTINF:-1 tvg-id="NTV.tr",NTV (720p) [Not 24/7]
 https://dogus-live.daioncdn.net/ntv/ntv.m3u8
@@ -409,9 +409,9 @@ https://demiroren-live.daioncdn.net/teve2/teve2.m3u8
 https://tv.ensonhaber.com/tv/tr/tgrtbelgesel/index.m3u8
 #EXTINF:-1 tvg-id="TGRTBelgesel.tr",TGRT Belgesel TV (576p) [Not 24/7]
 https://b01c02nl.mediatriple.net/videoonlylive/mtsxxkzwwuqtglive/broadcast_5fe462afc6a0e.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",TGRT Europe (1080p)
+#EXTINF:-1 tvg-id="TGRTEurope.tr",TGRT Europe (1080p)
 https://canli.tgrteu.com/tgrteu.m3u8
-#EXTINF:-1 tvg-id="",TGRT Europe (576p)
+#EXTINF:-1 tvg-id="TGRTEurope.tr",TGRT Europe (576p)
 https://tv.ensonhaber.com/tv/tr/tgrteu/index.m3u8
 #EXTINF:-1 tvg-id="TGRTHaber.tr",TGRT Haber (720p)
 https://canli.tgrthaber.com/tgrt.m3u8
@@ -429,7 +429,7 @@ https://59cba4d34b678.streamlock.net/canlitv/topraktv/playlist.m3u8
 https://59cba4d34b678.streamlock.net/canlitv/torbatv/playlist.m3u8
 #EXTINF:-1 tvg-id="24TV.tr",TR24 TV (720p) [Not 24/7]
 https://tv.ensonhaber.com/tv24/tv24.m3u8
-#EXTINF:-1 tvg-id="",Trakya Türk TV (720p)
+#EXTINF:-1 tvg-id="TrakyaTurk.tr",Trakya Türk TV (720p)
 https://live.artidijitalmedya.com/artidijital_trakyaturk/trakyaturk/playlist.m3u8
 #EXTINF:-1 tvg-id="TRT1.tr",TRT 1 (1080p)
 https://trt1.persona.video/master.m3u8?hls=1
@@ -509,7 +509,7 @@ https://edge1.socialsmart.tv/tv52/bant1/playlist.m3u8
 https://tv100.blutv.com/blutv_tv100_live/live.m3u8
 #EXTINF:-1 tvg-id="TV264.tr",TV 264 (1080p)
 https://b01c02nl.mediatriple.net/videoonlylive/mtdxkkitgbrckilive/broadcast_5ee244263fd6d.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV A (720p)
+#EXTINF:-1 tvg-id="TVA.tr",TV A (720p)
 https://live.artidijitalmedya.com/artidijital_tva/tva/playlist.m3u8
 #EXTINF:-1 tvg-id="TVDen.tr",TV Den (576p) [Not 24/7]
 http://canli.tvden.com.tr/hls/live.m3u8
@@ -527,7 +527,7 @@ https://mn-nl.mncdn.com/blutv_ulketv2/live.m3u8
 https://stream.guventechnology.com:19360/ulusaltv/ulusaltv.m3u8
 #EXTINF:-1 tvg-id="UniversiteTV.tr",Üniversite TV (720p) [Not 24/7]
 https://vdo.digitalbox.xyz:3986/live/unitvlive.m3u8
-#EXTINF:-1 tvg-id="",Urfa Natik TV (720p)
+#EXTINF:-1 tvg-id="UrfaNatikTV.tr",Urfa Natik TV (720p)
 https://live.artidijitalmedya.com/artidijital_urfanatiktv/urfanatiktv/playlist.m3u8
 #EXTINF:-1 tvg-id="UUTV1.tr",ÜÜ TV 1 (1080p)
 https://uskudarunv.mediatriple.net/uskudarunv/uskudar1/playlist.m3u8
@@ -548,7 +548,7 @@ https://59cba4d34b678.streamlock.net/live/vuslattv/playlist.m3u8
 https://live.artidijitalmedya.com/artidijital_vuslattv/vuslattv/playlist.m3u8
 #EXTINF:-1 tvg-id="WomanTV.tr",Woman TV (1080p)
 https://embedlp.becdn.net/womantv.m3u8
-#EXTINF:-1 tvg-id="",World Turk TV (1080p)
+#EXTINF:-1 tvg-id="WorldTurkTV.tr",World Turk TV (1080p)
 https://live.artidijitalmedya.com/artidijital_worldturk/worldturk/playlist.m3u8
 #EXTINF:-1 tvg-id="YOLTV.de",Yol TV (720p)
 https://stream.yol.tv:9443/medialive/yol.m3u8
diff --git a/streams/ua.m3u b/streams/ua.m3u
index 4db720dd3..32861cfdb 100644
--- a/streams/ua.m3u
+++ b/streams/ua.m3u
@@ -23,7 +23,7 @@ http://langate.tv/promin/live_720/index.m3u8
 http://vcdn1.produck.company:1935/out/dtv/playlist.m3u8
 #EXTINF:-1 tvg-id="DumskayaTV.ua",Dumskaya TV (720p)
 http://cdn1.live-tv.od.ua:8081/dumska/dumska720p/playlist.m3u8
-#EXTINF:-1 tvg-id="",EWTN Ukraine (1080p)
+#EXTINF:-1 tvg-id="EWTNUkraine.ua",EWTN Ukraine (1080p)
 https://cdn3.wowza.com/1/WjduMm1tYnlwNXQx/M01NV3Uz/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="FirstBusiness.ua" user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0",First Business (720p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0
diff --git a/streams/ug.m3u b/streams/ug.m3u
index c2b2c87ee..96c53144c 100644
--- a/streams/ug.m3u
+++ b/streams/ug.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Alpha Digital (480p)
+#EXTINF:-1 tvg-id="AlphaDigital.ug",Alpha Digital (480p)
 http://streamfi-alphadgtl1.zettawiseroutes.com:8080/hls/stream_src.m3u8
 #EXTINF:-1 tvg-id="ArkTV.ug",Ark TV (576p) [Not 24/7]
 https://arktelevision.org/hlslive/test/test.m3u8
@@ -7,39 +7,39 @@ https://arktelevision.org/hlslive/test/test.m3u8
 https://webstreaming.viewmedia.tv/web_035/Stream/playlist.m3u8
 #EXTINF:-1 tvg-id="BBSTV.ug",BBS TV (180p)
 https://cdn1.rea.cdn.moderntv.eu/readymedia/stream/BBSTV/5-hls/live-media.m3u8
-#EXTINF:-1 tvg-id="",Bethany TV (480p)
+#EXTINF:-1 tvg-id="BethanyTV.ug",Bethany TV (480p)
 https://readymedia.moderntv.cloud:8092/distribute/readymedia/tv_bethany_stream_ye/5-20-hls/live.m3u8
-#EXTINF:-1 tvg-id="",BTM TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="BTMTV.ug",BTM TV (480p) [Not 24/7]
 https://btmug.zerocdn.org/hls/stream.m3u8
 #EXTINF:-1 tvg-id="BukeddeTV1.ug",Bukedde TV 1 (576p)
 https://stream.hydeinnovations.com/bukedde1flussonic/index.m3u8
 #EXTINF:-1 tvg-id="BukeddeTV2.ug",Bukedde TV 2 (576p) [Not 24/7]
 https://stream.hydeinnovations.com/bukedde2flussonic/index.m3u8
-#EXTINF:-1 tvg-id="",CCCO Aspire TV (676p)
+#EXTINF:-1 tvg-id="CCCOAspireTV.ug",CCCO Aspire TV (676p)
 https://panel.freedomflixtv.org:3948/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="ChurchofUgandaFamilyTelevision.ug",COU Family Television (720p)
 https://media.streambrothers.com:19360/8028/8028.m3u8
 #EXTINF:-1 tvg-id="DreamTV.ug",Dream TV (480p)
 https://readymedia.moderntv.cloud:8092/distribute/readymedia/DREAMTV_stream_43/5-20-hls/live.m3u8
-#EXTINF:-1 tvg-id="",Faraja Television (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="FarajaTelevision.ug",Faraja Television (1080p) [Not 24/7]
 https://panel.freedomflixtv.org:3868/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="FORTTV.ug",Fort TV (480p)
 http://fort.co-works.org:8080/hls/live.stream.m3u8
-#EXTINF:-1 tvg-id="",Freedom Experience TV (720p)
+#EXTINF:-1 tvg-id="FreedomExperienceTV.ug",Freedom Experience TV (720p)
 https://panel.freedomflixtv.org:3934/hybrid/play.m3u8
-#EXTINF:-1 tvg-id="",Freedom Love Zone TV (720p)
+#EXTINF:-1 tvg-id="FreedomLoveZoneTV.ug",Freedom Love Zone TV (720p)
 https://panel.freedomflixtv.org:3665/hybrid/play.m3u8
-#EXTINF:-1 tvg-id="",Freedom Movie Sphere (720p)
+#EXTINF:-1 tvg-id="FreedomMovieSphere.ug",Freedom Movie Sphere (720p)
 https://panel.freedomflixtv.org:3311/stream/play.m3u8
-#EXTINF:-1 tvg-id="",Galaxy TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="GalaxyTV.ug",Galaxy TV (480p) [Not 24/7]
 https://readymedia.moderntv.cloud:8092/distribute/readymedia/ABS_stream_gy/5-20-hls/live.m3u8
-#EXTINF:-1 tvg-id="",Gugudde TV (480p)
+#EXTINF:-1 tvg-id="GuguddeTV.ug",Gugudde TV (480p)
 https://readymedia.moderntv.cloud:8092/distribute/readymedia/GUGUDDETV_stream_tj/5-20-hls/live.m3u8
-#EXTINF:-1 tvg-id="",Host TV (720p)
+#EXTINF:-1 tvg-id="HostTV.ug",Host TV (720p)
 https://panel.freedomflixtv.org:3994/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="KingSolomonTV.ug",KSTV Uganda (480p)
 https://readymedia.moderntv.cloud:8092/distribute/readymedia/KS_TV_stream_dc/5-20-hls/live.m3u8
-#EXTINF:-1 tvg-id="",Moon TV (180p)
+#EXTINF:-1 tvg-id="MoonTV.ug",Moon TV (180p)
 https://cdn1.rea.cdn.moderntv.eu/readymedia/stream/Moon_tv/5-hls/live-media.m3u8
 #EXTINF:-1 tvg-id="",Movie Sphere (1080p)
 https://panel.freedomflixtv.org:3048/stream/play.m3u8
@@ -49,7 +49,7 @@ http://197.239.30.29/readymedia/stream/tvnbs_tv/20-hls/live-media.m3u8
 https://readymedia.moderntv.cloud:8092/distribute/readymedia/NBS_Live_stream_ze/5-20-hls/live.m3u8
 #EXTINF:-1 tvg-id="PraiseJesusTowerTV.ug",Praise Jesus Tower TV (480p)
 https://5d00db0e0fcd5.streamlock.net/7328/7328/playlist.m3u8
-#EXTINF:-1 tvg-id="",Rest TV (360p)
+#EXTINF:-1 tvg-id="RestTV.ug",Rest TV (360p)
 https://cdn1.rea.cdn.moderntv.eu/readymedia/stream/RestTV/10-hls/live-media.m3u8
 #EXTINF:-1 tvg-id="SaltTV.ug",Salt TV (1080p)
 https://live.salttelevision.com/app/stream/abr.m3u8
@@ -59,19 +59,19 @@ https://readymedia.moderntv.cloud:8092/distribute/readymedia/SALTTV_stream_13/5-
 http://197.239.30.29/readymedia/stream/tv_sanyuka/20-hls/live-media.m3u8
 #EXTINF:-1 tvg-id="SanyukaTV.ug",Sanyuka TV (360p)
 https://cdn1.rea.cdn.moderntv.eu/readymedia/stream/tv_sanyuka/10-hls/live-media.m3u8
-#EXTINF:-1 tvg-id="",Spirit Of Glory TV (360p)
+#EXTINF:-1 tvg-id="SpiritOfGloryTV.ug",Spirit Of Glory TV (360p)
 https://panel.freedomflixtv.org:3937/hybrid/play.m3u8
-#EXTINF:-1 tvg-id="",Spirit TV (480p)
+#EXTINF:-1 tvg-id="SpiritTV.ug",Spirit TV (480p)
 https://readymedia.moderntv.cloud:8092/distribute/readymedia/SPIRIT_stream_68/5-20-hls/live.m3u8
 #EXTINF:-1 tvg-id="TopTV.ug",Top TV (360p)
 https://cdn1.rea.cdn.moderntv.eu/readymedia/stream/TOPTV/10-hls/live-media.m3u8
-#EXTINF:-1 tvg-id="",Trust TV (720p)
+#EXTINF:-1 tvg-id="TrustTV.ug",Trust TV (720p)
 https://panel.freedomflixtv.org:3900/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="TVEast.ug",TV East (720p)
 https://stream.hydeinnovations.com/boratv/index.m3u8
 #EXTINF:-1 tvg-id="TVWest.ug",TV West (720p)
 https://stream.hydeinnovations.com/tvwest-flussonic/index.m3u8
-#EXTINF:-1 tvg-id="",U24 Television (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="U24Television.ug",U24 Television (480p) [Not 24/7]
 https://cdn1.rea.cdn.moderntv.eu/readymedia/stream/U24/5-20-hls/live.m3u8
 #EXTINF:-1 tvg-id="UBCTV.ug",UBC TV (621p)
 http://197.239.30.29/readymedia/stream/ubc/20-hls/live-media.m3u8
diff --git a/streams/uk.m3u b/streams/uk.m3u
index 8dd82c648..7f0fa7ab2 100644
--- a/streams/uk.m3u
+++ b/streams/uk.m3u
@@ -21,8 +21,6 @@ https://liveedge-arisenews.visioncdn.com/live-hls/arisenews/arisenews/arisenews_
 https://d2vnbkvjbims7j.cloudfront.net/containerA/LTN/playlist.m3u8
 #EXTINF:-1 tvg-id="BBCNewsAsiaPacific.uk",BBC News Asia Pacific (720p)
 https://cdn4.skygo.mn/live/disk1/BBC_News/HLSv3-FTA/BBC_News.m3u8
-#EXTINF:-1 tvg-id="BBCOneSouthWestHD.uk",BBC One South West HD (720p)
-https://november.queazified.co.uk/ee971134-115e-4418-8d1d-69dff7d4c6eb.m3u8
 #EXTINF:-1 tvg-id="BBCTwo.uk",BBC Two UK (1080p)
 https://d20opqftbkv2z0.cloudfront.net/live13/bbctwo/bitrate1-clear.isml/live.m3u8
 #EXTINF:-1 tvg-id="BBCNewsSouthAsia.uk",BBC World News South Asia
@@ -47,15 +45,13 @@ https://a.jsrdn.com/broadcast/22693_4rGhgrBU/-0800/c.m3u8
 https://api.visionip.tv/live/ASHTTP/visiontvuk-international-britishmuslimtv-hsslive-25f-16x9-MB/playlist.m3u8
 #EXTINF:-1 tvg-id="ChannelS.uk",Channel S (576p) [Not 24/7]
 https://ap02.iqplay.tv:8082/iqb8002/ch4n3ls/playlist.m3u8
-#EXTINF:-1 tvg-id="CNBCEurope.uk",CNBC Europe/World (1080p) [Geo-blocked]
-https://amg01079-nbcuuk-amg01079c1-samsung-es-1261.playouts.now.amagi.tv/playlist/amg01079-nbcuukfast-cnbcpe-samsunges/playlist.m3u8
 #EXTINF:-1 tvg-id="DeenTV.uk",Deen TV (576p) [Not 24/7]
 https://ap02.iqplay.tv:8082/iqb8002/d33ntv/playlist.m3u8
 #EXTINF:-1 tvg-id="ElshaddaiTelevisionNetwork.uk",Elshaddai Television Network (720p)
 https://5d00db0e0fcd5.streamlock.net/7586/7586/playlist.m3u8
 #EXTINF:-1 tvg-id="EmanChannel.uk",Eman Channel (576p)
 https://ap02.iqplay.tv:8082/iqb8002/3m9n/playlist.m3u8
-#EXTINF:-1 tvg-id="",Frecuencia Musical TV [Not 24/7]
+#EXTINF:-1 tvg-id="FMTV.uk",Frecuencia Musical TV [Not 24/7]
 https://s2.tvdatta.com:3307/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="GarshomTV.uk",Garshom TV (360p) [Not 24/7]
 https://og2qd3aal7an-hls-live.5centscdn.com/garshomtv/d0dbe915091d400bd8ee7f27f0791303.sdp/playlist.m3u8
@@ -105,7 +101,7 @@ https://webstreaming.viewmedia.tv/web_020/Stream/playlist.m3u8
 https://dk7psf0dh3v1r.cloudfront.net/KMTV/playlist.m3u8
 #EXTINF:-1 tvg-id="KoolLondonRadio.uk",Kool London Radio (720p)
 http://w10.streamgb.com:1935/kool/kool/playlist.m3u8
-#EXTINF:-1 tvg-id="",Latest TV [Not 24/7]
+#EXTINF:-1 tvg-id="LatestTV.uk",Latest TV [Not 24/7]
 https://5a0e89631aa14.streamlock.net/LatestTV/LatestTV/playlist.m3u8
 #EXTINF:-1 tvg-id="LollyKids.uk",Lolly Kids (480p)
 http://45.225.95.170:8000/play/a0ei/index.m3u8
@@ -133,8 +129,6 @@ https://livemtaasia.akamaized.net/hls/live/2039224/mta6asia/playlist.m3u8
 https://livemtaasia.akamaized.net/hls/live/2039224/mtaasia2/playlist.m3u8
 #EXTINF:-1 tvg-id="MTA8America.uk",MTA8 America (1080p)
 https://chlivemta.akamaized.net/hls/live/2016718/mta8/playlist.m3u8
-#EXTINF:-1 tvg-id="MTVLive.uk",MTV Live
-http://190.102.246.93:9005/play/a01p
 #EXTINF:-1 tvg-id="MUTV.uk",MUTV (720p)
 https://bcovlive-a.akamaihd.net/r2d2c4ca5bf57456fb1d16255c1a535c8/eu-west-1/6058004203001/playlist.m3u8
 #EXTINF:-1 tvg-id="",n TV (US Eastern) (720p) [Not 24/7]
@@ -171,8 +165,6 @@ https://simaytv.akamaized.net/hls/live/2043550/simayhls/index.m3u8
 https://d2xeo83q8fcni6.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/SkiTV-SynapseTV/193.m3u8
 #EXTINF:-1 tvg-id="SKITV.ch",Ski TV (1080p) [Not 24/7]
 https://d2xeo83q8fcni6.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/SkiTV-Zee/193.m3u8
-#EXTINF:-1 tvg-id="",Sky News Weather (720p)
-https://november.queazified.co.uk/b5cce7c4-3f0a-4d6c-8855-e042ef309962.m3u8
 #EXTINF:-1 tvg-id="SomaliCableTV.uk",Somali cable (576p)
 https://ap02.iqplay.tv:8082/iqb8002/somc131/playlist.m3u8
 #EXTINF:-1 tvg-id="STV.uk",STV (1080p) [Geo-blocked]
@@ -199,5 +191,13 @@ https://abr.de1se01.v2beat.live/playlist.m3u8
 https://de1se01.v2beat.live/playlist.m3u8
 #EXTINF:-1 tvg-id="VeriteTV.uk",Vérité TV (720p) [Not 24/7]
 http://51.254.199.122:8080/veriteTV/index.m3u8
-#EXTINF:-1 tvg-id="",Zaire TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="ZaireTV.uk",Zaire TV (720p) [Not 24/7]
 https://5caf24a595d94.streamlock.net:1937/kcvugnzbpu/kcvugnzbpu/playlist.m3u8
+#EXTINF:-1 tvg-id="MTVLive.uk",MTV Live
+http://190.102.246.93:9005/play/a01p
+#EXTINF:-1 tvg-id="CNBCEurope.uk",CNBC Europe/World (1080p) [Geo-blocked]
+https://amg01079-nbcuuk-amg01079c1-samsung-es-1261.playouts.now.amagi.tv/playlist/amg01079-nbcuukfast-cnbcpe-samsunges/playlist.m3u8
+#EXTINF:-1 tvg-id="BBCOneSouthWestHD.uk",BBC One South West HD (720p)
+https://november.queazified.co.uk/ee971134-115e-4418-8d1d-69dff7d4c6eb.m3u8
+#EXTINF:-1 tvg-id="SkyNewsWeather.uk",Sky News Weather (720p)
+https://november.queazified.co.uk/b5cce7c4-3f0a-4d6c-8855-e042ef309962.m3u8
diff --git a/streams/uk_bbc.m3u b/streams/uk_bbc.m3u
index 770e88b43..867c1cbc1 100644
--- a/streams/uk_bbc.m3u
+++ b/streams/uk_bbc.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",BBC Alba (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="BBCAlba.uk",BBC Alba (720p) [Geo-blocked]
 https://vs-cmaf-pushb-uk.live.fastly.md.bbci.co.uk/x=4/i=urn:bbc:pips:service:bbc_alba/iptv_hd_abr_v1.mpd
 #EXTINF:-1 tvg-id="BBCArabic.uk",BBC Arabic (720p)
 https://vs-cmaf-pushb-ww-live.akamaized.net/x=4/i=urn:bbc:pips:service:bbc_arabic_tv/pc_hd_abr_v2.mpd
diff --git a/streams/us.m3u b/streams/us.m3u
index 318f004fc..6d122c468 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -1,10 +1,8 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",30A Ridiculous TV (720p)
+#EXTINF:-1 tvg-id="30ARidiculousTV.us",30A Ridiculous TV (720p)
 https://30a-tv.com/feeds/720p/63.m3u8
 #EXTINF:-1 tvg-id="247Retro.us",247 Retro TV (432p) [Not 24/7]
 http://hlsdpi-cdn-chqtx02.totalstream.net/dpilive/247retro/ret/dai/playlist.m3u8
-#EXTINF:-1 tvg-id="WPLGDT1.us",ABC (WPLG) (480p)
-https://tx1.nexgen.bz/ABC/index.m3u8
 #EXTINF:-1 tvg-id="ABCNewsLive.us",ABC News (720p)
 https://content.uplynk.com/channel/3324f2467c414329b3b0cc5cd987b6be.m3u8
 #EXTINF:-1 tvg-id="ABNAfghanistan.us",ABN Afghanistan (540p)
@@ -31,7 +29,7 @@ https://livestream.telvue.com/accvision1/f7b44cfafd5c52223d5498196c8a2e7b.sdp/pl
 https://livestream.telvue.com/accvision2/f7b44cfafd5c52223d5498196c8a2e7b.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="ACTV.us",ACTV
 https://castus-vod-dev.s3.amazonaws.com/vod_clients/athens/live/ch2/video.m3u8
-#EXTINF:-1 tvg-id="",Adult Swim Primal (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="AdultSwimPrimal.us",Adult Swim Primal (1080p) [Geo-blocked]
 https://adultswim-vodlive.cdn.turner.com/live/primal/stream_de.m3u8
 #EXTINF:-1 tvg-id="AfroLandTV.us",AfroLandTV (1080p)
 https://alt-al.otteravision.com/alt/al/al.m3u8
@@ -145,7 +143,7 @@ https://tgn.bozztv.com/betterlife/betterhealth/betterhealth/index.m3u8
 https://tgn.bozztv.com/betterlife/betternature/betternature/index.m3u8
 #EXTINF:-1 tvg-id="BetterLifeTV.us",Better Life TV (720p)
 https://tgn.bozztv.com/betterlife/betterlife/betterlife/index.m3u8
-#EXTINF:-1 tvg-id="",Big City TV
+#EXTINF:-1 tvg-id="BigCityTV.us",Big City TV
 https://bigcitytv.playout.vju.tv/bigcitytv/main.m3u8
 #EXTINF:-1 tvg-id="BilliardTV.us",Billiard TV (720p)
 https://9769bd6405b245ea9adca1889a0b491b.mediatailor.us-east-1.amazonaws.com/v1/master/f4e8c53a8367a5b58e20ce054ea3ce25a3e904d3/Samsung-in_BilliardTV/playlist.m3u8
@@ -201,8 +199,6 @@ https://bcovlive-a.akamaihd.net/r21fb8503a4a74d098b798f16922b2a36/us-east-1/7345
 https://bcovlive-a.akamaihd.net/r602a47f47fee47bb83239eb1b1e1ac83/us-east-1/734546207001/playlist.m3u8
 #EXTINF:-1 tvg-id="CBNNews.us",CBN News National (1080p)
 https://bcovlive-a.akamaihd.net/re8d9f611ee4a490a9bb59e52db91414d/us-east-1/734546207001/playlist.m3u8
-#EXTINF:-1 tvg-id="WFORDT1.us",CBS (WFOR) (480p)
-https://tx1.nexgen.bz/CBS/index.m3u8
 #EXTINF:-1 tvg-id="CBSSportsGolazoNetwork.us",CBS Sports Golazo Network
 https://dai.google.com/linear/hls/event/GxrCGmwST0ixsrc_QgB6qw/master.m3u8
 #EXTINF:-1 tvg-id="WTSPDT1.us",CBS WTSPDT (720p)
@@ -237,8 +233,6 @@ https://cloudflare.tv/hls/live.m3u8
 https://cmc-ono.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="CaliforniaMusicChannel.us",CMC-USA (California Music Channel) (720p)
 https://hwlive.streamingmediahosting.com/14215-live/0_obd393sh/playlist.m3u8
-#EXTINF:-1 tvg-id="CNBC.us",CNBC (480p)
-https://tx1.nexgen.bz/CNBC/index.m3u8
 #EXTINF:-1 tvg-id="CNBCIndonesia.id",CNBC Indonesia (720p)
 https://live.cnbcindonesia.com/livecnbc/smil:cnbctv.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="ComedyDynamics.us",Comedy Dynamics (1080p)
@@ -269,8 +263,6 @@ https://ctntv.getstreamhosting.com:1936/CTNTV/CTNTV/playlist.m3u8
 https://ctntv.getstreamhosting.com:1936/Lifestyle/Lifestyle/playlist.m3u8
 #EXTINF:-1 tvg-id="",Cult Classic Movie Theater (1080p)
 https://app.viloud.tv/hls/channel/053140e08adc29e3eac61eb05ff12f51.m3u8
-#EXTINF:-1 tvg-id="WPIXDT1.us",CW (WPIX) (480p)
-https://tx2.nexgen.bz/WPIX/index.m3u8
 #EXTINF:-1 tvg-id="DareToDreamNetwork.us",Dare To Dream Network (3ABN) (720p)
 https://3abn-live.akamaized.net/hls/live/2010545/D2D/master.m3u8
 #EXTINF:-1 tvg-id="Dateline247.us",Dateline 24/7
@@ -299,7 +291,7 @@ https://wescottcc.piksel.tech/hls/live/2041478/adp/playlist.m3u8
 https://wescottcc.piksel.tech/Manifest/UTB-NetworkStream.m3u8
 #EXTINF:-1 tvg-id="DreamforceBtl.us",Dreamforce Btl
 https://srv2.tropicalmoonmedia.com/dreamforcebtltv/dreamforcebtltv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Duck Hunting TV
+#EXTINF:-1 tvg-id="DuckHuntingTV.us",Duck Hunting TV
 https://main.duckhunting.playout.vju.tv/duckhuntingtv/main.m3u8
 #EXTINF:-1 tvg-id="EarthxTV.us",EarthxTV (720p)
 https://ov.ottera.tv/live/master.m3u8?channel=earth_et
@@ -315,7 +307,7 @@ https://elec-en.otteravision.com/elec/en/elec_en.m3u8
 https://hls-cdn.tvstartup17.net/tvstartup17-channel/live/mp4:emtmediaedge/playlist.m3u8
 #EXTINF:-1 tvg-id="EntertainmentTonight.us",Entertainment Tonight (720p)
 https://cbsta49f-cbsta49f-ms.global.ssl.fastly.net/amagi7b98-AmagiMixible/master/amagi7b98-AmagiMixible.m3u8
-#EXTINF:-1 tvg-id="",ESR 24x7 eSports Network (1080p)
+#EXTINF:-1 tvg-id="ESR24x7eSportsNetwork.us",ESR 24x7 eSports Network (1080p)
 https://eyeonesports.com/ES2RA-628g.m3u8
 #EXTINF:-1 tvg-id="EternalLifeTVNetwork.us",Eternal Life TV Network (1080p)
 https://livecdn.live247stream.com/eternallife/tv/playlist.m3u8
@@ -329,7 +321,7 @@ https://cdn3.wowza.com/1/ZVBYYXFLLzE0c3NC/Qk1FMURC/hls/live/playlist.m3u8
 https://cdn3.wowza.com/1/QmVNUVhTNTZSS3Uz/YWQ0aHpi/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNEspanaLatinAmerica.us",EWTN el Canal Católico (720p) [Not 24/7]
 https://cdn3.wowza.com/1/SmVrQmZCUXZhVDgz/b3J3MFJv/hls/live/playlist.m3u8
-#EXTINF:-1 tvg-id="",EWTN Estados Unidos (Spanish) (720p)
+#EXTINF:-1 tvg-id="EWTNEstadosUnidos.us",EWTN Estados Unidos (Spanish) (720p)
 https://cdn3.wowza.com/1/TUI5dU5ucnUxdGFD/ZFlVeGRl/hls/live/playlist.m3u8
 #EXTINF:-1 tvg-id="EWTNEurope.us",EWTN Europe (720p) [Not 24/7]
 https://cdn3.wowza.com/1/T2NXeHF6UGlGbHY3/WFluRldQ/hls/live/playlist.m3u8
@@ -345,14 +337,12 @@ https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc5us/master.m3u8
 http://163.47.214.155:1935/fwnews/live/playlist.m3u8
 #EXTINF:-1 tvg-id="Fite.us",Fite (720p) [Not 24/7]
 https://cdn-cf.fite.tv/linear/fite247/playlist.m3u8
-#EXTINF:-1 tvg-id="",Flowers TV USA
+#EXTINF:-1 tvg-id="FlowersTVUSA.us",Flowers TV USA
 https://yuppmedtaorire.akamaized.net/v1/master/a0d007312bfd99c47f76b77ae26b1ccdaae76cb1/flowers_nim_https/050522/flowers/playlist.m3u8
 #EXTINF:-1 tvg-id="FolkTV.us",Folk TV
 http://584b0aa350b92.streamlock.net:1935/folk-tv/myStream.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="FolkTV.us",Folk TV East (480p) [Not 24/7]
 https://584b0aa350b92.streamlock.net/folk-tv/myStream.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="WSVNDT1.us",FOX (WSVN) (720p)
-https://tx2.nexgen.bz/FOX/index.m3u8
 #EXTINF:-1 tvg-id="FoxBusinessNetwork.us",FOX Business (1080p)
 http://41.205.93.154/FOXBUSINESS/index.m3u8
 #EXTINF:-1 tvg-id="FoxNewsChannel.us",Fox News Channel (144p)
@@ -379,7 +369,7 @@ http://201.144.184.98:1935/genesis/smil:television.smil/playlist.m3u8
 http://liveen24-manminglobal3.ktcdn.co.kr/liveen24/gcnus_1300k.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="GlobalFashionChannel.us",Global Fashion Channel (1080p)
 https://pubgfc.teleosmedia.com/linear/globalfashionchannel/globalfashionchannel/playlist.m3u8
-#EXTINF:-1 tvg-id="",GLV
+#EXTINF:-1 tvg-id="GlobalLinkVision.us",GLV
 https://38b3095.online-server.cloud/hls/live.m3u8
 #EXTINF:-1 tvg-id="Go2Travel.us",Go2Travel (1080p)
 https://go2thls.wns.live/hls/stream.m3u8
@@ -393,23 +383,23 @@ https://1-fss29-s0.streamhoster.com/lv_goodlife45f1/broadcast1/playlist.m3u8
 https://cdn3.wowza.com/5/Wi9jakJPdFhPREFj/live/myStream/playlist.m3u8
 #EXTINF:-1 tvg-id="GospelTruthTV.us",Gospel Truth TV
 https://na.linear.zype.com/bf94f9f4-383c-40e0-9d49-279a4f33ab8d/f29b8836-d990-4c8d-b421-192a8f43edc4-zype/manifest.m3u8
-#EXTINF:-1 tvg-id="",Grit Xtra
+#EXTINF:-1 tvg-id="GritXtra.us",Grit Xtra
 https://scripps-gritxtra-1-us.vizio.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Grit Xtra (1080p)
+#EXTINF:-1 tvg-id="GritXtra.us",Grit Xtra (1080p)
 https://linear-83.frequency.stream/83/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="grvty.us",grvty (1080p)
 https://d37j5jg7ob6kji.cloudfront.net/index.m3u8
-#EXTINF:-1 tvg-id="",GTN New York (1080p)
+#EXTINF:-1 tvg-id="GTNNewYork.us",GTN New York (1080p)
 https://tvsw1-hls.secdn.net/tvsw1-chorigin/play/prod-3eebc0944a89469eba873253c04a7129/playlist.m3u8
-#EXTINF:-1 tvg-id="",GTN Orlando (1080p)
+#EXTINF:-1 tvg-id="GTNOrlando.us",GTN Orlando (1080p)
 https://tvsw1-hls.secdn.net/tvsw1-chorigin/play/prod-b9be4360b39e4414a5c30e5b0aa667c1/playlist.m3u8
-#EXTINF:-1 tvg-id="",GTN South Florida (1080p)
+#EXTINF:-1 tvg-id="GTNSouthFlorida.us",GTN South Florida (1080p)
 https://tvsw2-hls.secdn.net/tvsw2-chorigin/play/prod-aa4d335124414856b118e943d91132d5/playlist.m3u8
-#EXTINF:-1 tvg-id="",Guyana Music TV (1080p)
+#EXTINF:-1 tvg-id="GMTV.us",Guyana Music TV (1080p)
 https://tvsw2-hls.secdn.net/tvsw2-chorigin/play/prod-59455895b1214d3893e29a4f536fca3d/playlist.m3u8
-#EXTINF:-1 tvg-id="",GuyBai TV (1080p)
+#EXTINF:-1 tvg-id="GuyBaiTV.us",GuyBai TV (1080p)
 https://tvsw2-hls.secdn.net/tvsw2-chorigin/play/prod-d7e7cf219d634e0bbf7d5340b4b537da/playlist.m3u8
-#EXTINF:-1 tvg-id="",GuyTube TV (1080p)
+#EXTINF:-1 tvg-id="GuyTubeTV.us",GuyTube TV (1080p)
 https://tvsw2-hls.secdn.net/tvsw2-chorigin/play/prod-55ed6f9cb6d64b22a5eed2ea3f349533/playlist.m3u8
 #EXTINF:-1 tvg-id="",HarPal Geo (360p)
 https://jk3lz82elw79-hls-live.5centscdn.com/harPalGeo/955ad3298db330b5ee880c2c9e6f23a0.sdp/harPalGeo/Live1/index.m3u8
@@ -427,7 +417,7 @@ https://videodelivery.net/8dfdf197ede241dd3c8b745a08e039e5/manifest/video.m3u8
 https://qvc-amd-live.akamaized.net/hls/live/2034113/lshsn1us/master.m3u8
 #EXTINF:-1 tvg-id="HSN2.us",HSN2
 https://qvc-amd-live.akamaized.net/hls/live/2034113/lshsn2us/master.m3u8
-#EXTINF:-1 tvg-id="",HSN West
+#EXTINF:-1 tvg-id="HSNWest.us",HSN West
 https://qvc-amd-live.akamaized.net/hls/live/2034113/lshsn1uswest/master.m3u8
 #EXTINF:-1 tvg-id="HumraazTV.us",Humraaz TV [Not 24/7]
 https://cdn61.liveonlineservices.com/hls/humraaz.m3u8
@@ -435,7 +425,7 @@ https://cdn61.liveonlineservices.com/hls/humraaz.m3u8
 https://1111296894.rsc.cdn77.org/LS-ATL-56868-1/index.m3u8
 #EXTINF:-1 tvg-id="IFCEast.us",IFC East (1080p)
 https://bcovlive-a.akamaihd.net/7304338dca7a4c91b8f0504de0342687/us-east-1/6240731308001/playlist.m3u8
-#EXTINF:-1 tvg-id="",IMPACT Plus! (1080p)
+#EXTINF:-1 tvg-id="ImpactPlus.us",IMPACT Plus! (1080p)
 https://d2tuwvs0ja335j.cloudfront.net/hls/main.m3u8
 #EXTINF:-1 tvg-id="IntheKitchen.us",In the kitchen
 https://qvc-amd-live.akamaized.net/hls/live/2034113/lsqvc4us/master.m3u8
@@ -463,7 +453,7 @@ https://app.viloud.tv/hls/channel/07c8b76fa3a98409d527cede85852d55.m3u8
 https://content.jwplatform.com/live/broadcast/oe7UD7Ag.m3u8
 #EXTINF:-1 tvg-id="",Jewelry Television Espanol (720p)
 https://82934cf9c8696bd2.mediapackage.us-east-1.amazonaws.com/out/v1/72b5a55e4c35445f9e742871aa0aefa2/index.m3u8
-#EXTINF:-1 tvg-id="",Jewelry TV 2 (720p)
+#EXTINF:-1 tvg-id="JewelryTV2.us",Jewelry TV 2 (720p)
 https://content.jwplatform.com/live/broadcast/RW3cCwlw.m3u8
 #EXTINF:-1 tvg-id="JewishLifeTelevision.us",Jewish Life Television
 https://d35j504z0x2vu2.cloudfront.net/v1/master/0bc8e8376bd8417a1b6761138aa41c26c7309312/jewish-life-television-jltv/playlist.m3u8
@@ -475,8 +465,6 @@ http://teleredmcp.com:1935/jrestv/jrestv/playlist.m3u8
 https://livevideo01.kare11.com/hls/live/2014544/elvs/live.m3u8
 #EXTINF:-1 tvg-id="KBMTDT1.us",KBMT-DT1 (1080p)
 https://livevideo01.12newsnow.com/hls/live/2017379/elvs/live.m3u8
-#EXTINF:-1 tvg-id="KCTVDT1.us",KCTV-DT1 [Geo-blocked]
-https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00312-graytelevisioni-kctv5news-vizious/playlist.m3u8
 #EXTINF:-1 tvg-id="KFMBDT1.us",KFMB-DT1 (1080p)
 https://livevideo01.cbs8.com/hls/live/2014967/elvs/live.m3u8
 #EXTINF:-1 tvg-id="KFSMDT1.us",KFSM-DT1 (1080p)
@@ -485,16 +473,12 @@ https://livevideo01.5newsonline.com/hls/live/2011653/elvs/live.m3u8
 https://livevideo01.kgw.com/hls/live/2015506/elvs/live.m3u8
 #EXTINF:-1 tvg-id="KIRODT1.us",KIRO-DT1 (1080p)
 https://cdn-ue1-prod.tsv2.amagi.tv/linear/amg00327-coxmediagroup-kirobreaking-ono/playlist.m3u8
-#EXTINF:-1 tvg-id="KMOVDT1.us",KMOV-DT1 [Geo-blocked]
-https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00312-graytelevisioni-kmovnews4stlouis-vizious/playlist.m3u8
 #EXTINF:-1 tvg-id="KOKIDT1.us",KOKI-DT1 (1080p)
 https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg02104-imagicommcommun-kokibreaking-ono/playlist.m3u8
 #EXTINF:-1 tvg-id="KPNXDT1.us",KPNX-DT1 (1080p)
 https://livevideo01.12news.com/hls/live/2015501/elvs/live.m3u8
 #EXTINF:-1 tvg-id="KRISDT1.us",KRIS-DT1 (1080p)
 https://content.uplynk.com/channel/e72660594b7a4182982af1690609683d.m3u8
-#EXTINF:-1 tvg-id="KRISDT1.us",KRIS-DT1 (720p)
-https://content.uplynk.com/channel/f805c6ab7ddf4e2489ae648bb28fb133.m3u8
 #EXTINF:-1 tvg-id="KSDKDT1.us",KSDK-DT1 (1080p)
 https://livevideo01.ksdk.com/hls/live/2014965/elvs/live.m3u8
 #EXTINF:-1 tvg-id="KTHVDT1.us",KTHV-DT1 (1080p)
@@ -513,7 +497,7 @@ https://livevideo01.cbs19.tv/hls/live/2017377/elvs/live.m3u8
 https://content.uplynk.com/channel/d1f868588ae5476dadaeff450170a183.m3u8
 #EXTINF:-1 tvg-id="LaMegaMundial.us",La Mega Mundial
 https://server40.servistreaming.com:3477/stream/play.m3u8
-#EXTINF:-1 tvg-id="",La Que Buena Atlanta
+#EXTINF:-1 tvg-id="LaQueBuenaAtlanta.us",La Que Buena Atlanta
 https://streamyes.alsolnet.com/quebuenaatlanta/live/index.m3u8
 #EXTINF:-1 tvg-id="LaRosadeGuadalupe.us",La Rosa de Guadalupe
 https://linear-344.frequency.stream/dist/vix/344/hls/master/playlist.m3u8
@@ -577,22 +561,18 @@ https://84f081227bc1418984b9e3dcaa985b2b.mediatailor.us-east-1.amazonaws.com/v1/
 https://amg00378-maverickenterta-mavtv-smn-gb-samsung-rakuten-ozity.amagi.tv/playlist/amg00378-maverickenterta-mavtv-smn-gb-samsung-rakuten/playlist.m3u8
 #EXTINF:-1 tvg-id="WSBSDT1.us",Mega TV (1080p)
 https://mdstrm.com/live-stream-playlist/660b066dae419408a11b6072.m3u8
-#EXTINF:-1 tvg-id="",Merit Street (1080p)
+#EXTINF:-1 tvg-id="MeritStreet.us",Merit Street (1080p)
 https://tbn-jw.cdn.vustreams.com/live/merit-dev/live.isml/playlist.m3u8
 #EXTINF:-1 tvg-id="MissionTV.us",Mission TV (1080p) [Not 24/7]
 https://6096a9cf11ae5.streamlock.net:1943/live/missiontv/playlist.m3u8
 #EXTINF:-1 tvg-id="MissionTV.us",Mission TV (720p) [Not 24/7]
 http://stream.missiontv.com:1935/live/missiontv_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="MLBNetwork.us",MLB Network (480p)
-https://tx2.nexgen.bz/MLB/index.m3u8
 #EXTINF:-1 tvg-id="MohabatTV.us",Mohabat TV (540p)
 http://media.mohabat.tv:1935/live_transcoder/ngrp:mohabat.stream_all/playlist.m3u8
 #EXTINF:-1 tvg-id="",Motorbikes & Engines
 https://motors.playout.vju.tv/motors/main.m3u8
 #EXTINF:-1 tvg-id="",Mountain Bike TV
 https://sydandmacky.vju.tv/sydandmacky/main.m3u8?test=1
-#EXTINF:-1 tvg-id="MSNBC.us",MSNBC (480p)
-https://tx1.nexgen.bz/MSNBC/index.m3u8
 #EXTINF:-1 tvg-id="MTC.us",MTC (720p)
 https://mtchls.wns.live/hls/stream.m3u8
 #EXTINF:-1 tvg-id="NagoTV.us",Nago TV (240p)
@@ -601,19 +581,13 @@ https://lakay.online/public/nagotv/index.fmp4.m3u8
 https://livestream.telvue.com/nashuanh2/f7b44cfafd5c52223d5498196c8a2e7b.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="GovernmentTV16.us",Nashua GTV Channel 16 Nashua NH
 https://livestream.telvue.com/nashuanh3/f7b44cfafd5c52223d5498196c8a2e7b.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="NBATV.us",NBA TV (480p)
-https://tx2.nexgen.bz/NBA/index.m3u8
-#EXTINF:-1 tvg-id="WTVJDT1.us",NBC (WTVJ) (480p)
-https://tx1.nexgen.bz/NBC/index.m3u8
 #EXTINF:-1 tvg-id="WMAQDT1.us",NBC Chicago News 24/7 (1080p)
 https://nbculocalfast.akamaized.net/hls/live/2096797/nbcchicago/master.m3u8
-#EXTINF:-1 tvg-id="GolfChannel.us",NBC Golf (480p)
-https://tx1.nexgen.bz/GOLF/index.m3u8
 #EXTINF:-1 tvg-id="KNSDDT1.us",NBC West (San Diego) (1080p) [Not 24/7]
 https://nbculocallive.akamaized.net/hls/live/2037098/sandiego/stream1/master.m3u8
 #EXTINF:-1 tvg-id="NBCLX.us",NBCLX
 https://nbculocallive.akamaized.net/hls/live/2037096/lx/use1.m3u8
-#EXTINF:-1 tvg-id="",Newsmax 2 (720p)
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax 2 (720p)
 https://nmxlive.akamaized.net/hls/live/529965/Live_1/index.m3u8
 #EXTINF:-1 tvg-id="NewsmaxTV.us",Newsmax TV (720p)
 https://nmx1ota.akamaized.net/hls/live/2107010/Live_1/index.m3u8
@@ -633,8 +607,6 @@ https://unilivemtveu-lh.akamaihd.net/i/nickde_1@448749/master.m3u8
 http://fl1.moveonjoy.com/NICKELODEON/index.m3u8
 #EXTINF:-1 tvg-id="NickelodeonEast.us",Nickelodeon East (720p)
 http://143.244.60.30/NICKELODEON/index.m3u8
-#EXTINF:-1 tvg-id="NickelodeonEast.us",Nickelodeon East (720p)
-https://tx2.nexgen.bz/NICKELODEON/index.m3u8
 #EXTINF:-1 tvg-id="NickelodeonPanregional.us",Nickelodeon Panregional (480p)
 http://45.181.122.13:8000/play/019
 #EXTINF:-1 tvg-id="NicktoonsEast.us",NickToons (720p)
@@ -719,11 +691,11 @@ https://eu1.servers10.com:8081/8230/index.m3u8
 https://bcovlive-a.akamaihd.net/rc21a8bc6455344c699a06e9220fe2748/us-west-2/5245389775001/playlist.m3u8
 #EXTINF:-1 tvg-id="Revry2.us",Revry 2
 https://linear-5.frequency.stream/mt/brightcove/5/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="",Revry Brasil
+#EXTINF:-1 tvg-id="RevryBrasil.us",Revry Brasil
 https://linear-181.frequency.stream/mt/brightcove/181/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="",Revry Her
+#EXTINF:-1 tvg-id="RevryHer.us",Revry Her
 https://linear-73.frequency.stream/mt/brightcove/73/hls/master/playlist.m3u8
-#EXTINF:-1 tvg-id="",Revry LatinX
+#EXTINF:-1 tvg-id="RevryLatinX.us",Revry LatinX
 https://linear-142.frequency.stream/mt/brightcove/142/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="RevryNews.us",Revry News
 https://linear-44.frequency.stream/mt/brightcove/44/hls/master/playlist.m3u8
@@ -751,9 +723,9 @@ https://cdn-shop-lc-01.akamaized.net/Content/HLS_HLS/Live/channel(ott)/master.m3
 https://shoutfactory-shoutfactory-zype.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="SkwadPlay.us",SKWAD (1080p)
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=71
-#EXTINF:-1 tvg-id="",Sky Michigan TV
+#EXTINF:-1 tvg-id="SkyMichiganTV.us",Sky Michigan TV
 https://cdn-unified-hls.streamspot.com/ingest1/6ec6f5ba47/playlist.m3u8?origin=1
-#EXTINF:-1 tvg-id="",Sky TV New York (1080p)
+#EXTINF:-1 tvg-id="SkyTVNewYork.us",Sky TV New York (1080p)
 https://tvsw2-hls.secdn.net/tvsw2-chorigin/play/prod-2cb201942c94460d9356b2c138272263/playlist.m3u8
 #EXTINF:-1 tvg-id="SpiritTV.us",Spirit TV (720p) [Not 24/7]
 https://cdnlive.myspirit.tv/LS-ATL-43240-2/index.m3u8
@@ -765,7 +737,7 @@ https://2-fss-1.streamhoster.com/pl_122/206858-4412976-1/chunklist.m3u8
 https://bozztv.com/uni10rtmp/ssstv2-cdn/smil:ssstv2web.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TAGTV.us",TAG TV (1080p) [Not 24/7]
 https://cdn30.liveonlineservices.com/hls/tagtv.m3u8
-#EXTINF:-1 tvg-id="",Talkin Live Classics TV (480p)
+#EXTINF:-1 tvg-id="TalkinLiveClassicsTV.us",Talkin Live Classics TV (480p)
 https://2-fss-1.streamhoster.com/pl_122/206338-3120682-1/playlist.m3u8
 #EXTINF:-1 tvg-id="Tastemade.us",Tastemade (1080p)
 https://tastemadessai.akamaized.net/amagi_hls_data_tastemade-tastemade/CDN/playlist.m3u8
@@ -789,7 +761,7 @@ https://content.uplynk.com/channel/f9aafa1f132e40af9b9e7238bc18d128.m3u8
 https://m2b2.worldcast.tv:7443/dancetelevisionthree/dancetelevisionthree.m3u8
 #EXTINF:-1 tvg-id="TeleBoston.us",Tele Boston (480p)
 http://rtb.srfms.com:3333/live/telebostonrtb/playlist.m3u8
-#EXTINF:-1 tvg-id="",Telemundo Corpus Christi
+#EXTINF:-1 tvg-id="TelemundoCorpusChristi.us",Telemundo Corpus Christi
 https://content.uplynk.com/channel/b6a96ed39d694ae1b738faa98cf7dd3f.m3u8
 #EXTINF:-1 tvg-id="WBQCLD1.us",Telemundo East (480p)
 https://cdn.igocast.com/wkrp_channel1_hls/wkrp_channel1_master.m3u8
@@ -817,7 +789,7 @@ https://thefirst-distroscale.amagi.tv/index.m3u8
 https://ov.ottera.tv/live/master.m3u8?channel=mcom_gv_us
 #EXTINF:-1 tvg-id="WYPLTV18.us",The Library Channel TV18 (360p)
 https://reflect-memphis.cablecast.tv/live-2/live/live.m3u8
-#EXTINF:-1 tvg-id="",The Nest
+#EXTINF:-1 tvg-id="TheNest.us",The Nest
 https://content.uplynk.com/channel/b468fd41b60840579668c42c096a4103.m3u8
 #EXTINF:-1 tvg-id="TheNowNetwork.us",The Now Network (480p) [Not 24/7]
 https://link.frontlayer.com/services/hls2/fl619843/index.m3u8
@@ -825,7 +797,7 @@ https://link.frontlayer.com/services/hls2/fl619843/index.m3u8
 https://tscstreaming-lh.akamaihd.net/i/TSCLiveStreaming_1@91031/master.m3u8
 #EXTINF:-1 tvg-id="TheSoutheasternChannel.us",The Southeastern Channel (540p)
 http://147.174.13.196/live/live.m3u8
-#EXTINF:-1 tvg-id="",The Ultimate Music Channel (1080p)
+#EXTINF:-1 tvg-id="TheUltimateMusicChannel.us",The Ultimate Music Channel (1080p)
 https://app.viloud.tv/hls/channel/0694b92d093cc2bd5438ff9bbccaf1a2.m3u8
 #EXTINF:-1 tvg-id="TheWallStreetJournalLive.us",The Wall Street Journal Live (720p)
 https://d155hi8td9k2ns.cloudfront.net/out/wapo-medialive3-rtmp/live.m3u8
@@ -851,7 +823,7 @@ http://api.toonamiaftermath.com:3000/movies/playlist.m3u8
 http://api.toonamiaftermath.com:3000/radio/playlist.m3u8
 #EXTINF:-1 tvg-id="TopStoriesbyNewsy.us",Top Stories by Newsy (720p)
 https://content.uplynk.com/channel/33c48f602cfd4474b957eb4ad999caf8.m3u8
-#EXTINF:-1 tvg-id="",Travel Adventures with Jeff Swan (1080p)
+#EXTINF:-1 tvg-id="TravelAdventuresWithJeffSwan.us",Travel Adventures with Jeff Swan (1080p)
 https://app.viloud.tv/hls/channel/0d984388834adac967a4ec4e69bc8271.m3u8
 #EXTINF:-1 tvg-id="TropicalMusicTV.us",Tropical Music TV (720p)
 http://68.235.37.11:1935/vallenato/vallenato/.m3u8
@@ -861,7 +833,7 @@ https://tstv-stream.tsm.utexas.edu/hls/livestream_hi/index.m3u8
 https://dai.google.com/linear/hls/event/LKaz-eTgQvawHshATl-Qdw/master.m3u8
 #EXTINF:-1 tvg-id="TUTV.us",TUTV
 https://livestream.telvue.com/templeuni1/f7b44cfafd5c52223d5498196c8a2e7b.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="",TVS Bowling Network (720p)
+#EXTINF:-1 tvg-id="TVSBowlingNetwork.us",TVS Bowling Network (720p)
 https://bozztv.com/gusa/gusa-tvsbowling/index.m3u8
 #EXTINF:-1 tvg-id="TVSBoxing.us",TVS Boxing (360p)
 https://bozztv.com/gusa/gusa-tvsboxing/index.m3u8
@@ -879,7 +851,7 @@ https://bozztv.com/gusa/gusa-tvsdriveinmovie/index.m3u8
 https://bozztv.com/gusa/gusa-TVSFamilyChannel/index.m3u8
 #EXTINF:-1 tvg-id="TVSFilmNoirNetwork.us",TVS Film Noir Network (720p)
 https://bozztv.com/trn01/gusa-TVSFilmNoir/index.m3u8
-#EXTINF:-1 tvg-id="",TVS Flashback Network (360p)
+#EXTINF:-1 tvg-id="TVSFlashbackNetwork.us",TVS Flashback Network (360p)
 https://bozztv.com/gusa/gusa-TVSFlashback/index.m3u8
 #EXTINF:-1 tvg-id="",TVS Frontier Network (360p)
 https://bozztv.com/gusa/gusa-tvsfrontier/index.m3u8
@@ -919,13 +891,13 @@ https://bozztv.com/gusa/gusa-tvstn/index.m3u8
 https://bozztv.com/gusa/gusa-tvstravel/index.m3u8
 #EXTINF:-1 tvg-id="TVSTurbo.us",TVS Turbo (360p)
 https://bozztv.com/gusa/gusa-tvsturbo/index.m3u8
-#EXTINF:-1 tvg-id="",TVS Vintage Network (360p)
+#EXTINF:-1 tvg-id="TVSVintageNetwork.us",TVS Vintage Network (360p)
 https://bozztv.com/gusa/gusa-tvsvintage/index.m3u8
 #EXTINF:-1 tvg-id="TVSWesternMovie.us",TVS Western Movie (270p)
 https://bozztv.com/gusa/gusa-tvswesternmovies/index.m3u8
 #EXTINF:-1 tvg-id="TVSWomenSports.us",TVS Women Sports (720p)
 https://bozztv.com/gusa/gusa-tvswsn/index.m3u8
-#EXTINF:-1 tvg-id="",TVSConsumerDirect
+#EXTINF:-1 tvg-id="TVSConsumerDirect.us",TVSConsumerDirect
 https://rpn.bozztv.com/gusa/gusa-ConsumerDirect/index.m3u8
 #EXTINF:-1 tvg-id="UNWebTV.us",UN Web TV (540p)
 https://cdnapi.kaltura.com/p/2503451/sp/250345100/playManifest/entryId/1_gb6tjmle/protocol/https/format/applehttp/a.m3u8
@@ -965,8 +937,6 @@ https://livevideo01.localmemphis.com/hls/live/2011654/elvs/live.m3u8
 https://livevideo01.wbir.com/hls/live/2016515/elvs/live.m3u8
 #EXTINF:-1 tvg-id="WBNSDT1.us",WBNS-DT1 (1080p)
 https://livevideo01.10tv.com/hls/live/2013836/elvs/live.m3u8
-#EXTINF:-1 tvg-id="WBRADT3.us" tvg-shift="-4",WBRA PBS Kids (1080p)
-https://livestream.pbskids.org/out/v1/1e3d77b418ad4a819b3f4c80ac0373b5/est_124.m3u8
 #EXTINF:-1 tvg-id="WCNCDT1.us",WCNC-DT1 (1080p)
 https://livevideo01.wcnc.com/hls/live/2015505/elvs/live.m3u8
 #EXTINF:-1 tvg-id="WFMYDT1.us",WFMY-DT1 (1080p)
@@ -1019,7 +989,7 @@ https://video.tegnaone.com/wtsp/live/v1/master/f9c1bf9ffd6ac86b6173a7c169ff6e3f4
 https://stream-us-east-1.getpublica.com/playlist.m3u8?network_id=73
 #EXTINF:-1 tvg-id="WUSADT1.us",WUSA-DT1 (1080p)
 https://livevideo01.wusa9.com/hls/live/2015498/elvs/live.m3u8
-#EXTINF:-1 tvg-id="" tvg-shift="0",WVCU-LP Concord University Radio The Cure 97.7 (1080p)
+#EXTINF:-1 tvg-id="WVCULP.us" tvg-shift="0",WVCU-LP Concord University Radio The Cure 97.7 (1080p)
 https://video1.getstreamhosting.com:1936/8152/8152/playlist.m3u8
 #EXTINF:-1 tvg-id="WWLDT1.us",WWL-DT1 (1080p)
 https://livevideo01.wwltv.com/hls/live/2016516/elvs/live.m3u8
@@ -1035,6 +1005,36 @@ https://d1ewctnvcwvvvu.cloudfront.net/playlist.m3u8
 https://thegateway.app/YouToo/CueTones/playlist.m3u8
 #EXTINF:-1 tvg-id="YoutooAmerica.us",Youtoo America (1080p)
 https://thegateway.app/YouToo/YTamerica/playlist.m3u8
-#EXTINF:-1 tvg-id="",Zoom TV Kurdish (720p)
+#EXTINF:-1 tvg-id="ZoomNews.us",Zoom TV Kurdish (720p)
 #EXTVLCOPT:http-referrer=https://zoomnews.info/
 https://live.zoomnews.info/live/Zoom_playlist.m3u8
+#EXTINF:-1 tvg-id="WBRADT3.us" tvg-shift="-4",WBRA PBS Kids (1080p)
+https://livestream.pbskids.org/out/v1/1e3d77b418ad4a819b3f4c80ac0373b5/est_124.m3u8
+#EXTINF:-1 tvg-id="KCTVDT1.us",KCTV-DT1 [Geo-blocked]
+https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00312-graytelevisioni-kctv5news-vizious/playlist.m3u8
+#EXTINF:-1 tvg-id="KMOVDT1.us",KMOV-DT1 [Geo-blocked]
+https://cdn-uw2-prod.tsv2.amagi.tv/linear/amg00312-graytelevisioni-kmovnews4stlouis-vizious/playlist.m3u8
+#EXTINF:-1 tvg-id="CNBC.us",CNBC (480p)
+https://tx1.nexgen.bz/CNBC/index.m3u8
+#EXTINF:-1 tvg-id="NickelodeonEast.us",Nickelodeon East (720p)
+https://tx2.nexgen.bz/NICKELODEON/index.m3u8
+#EXTINF:-1 tvg-id="NBATV.us",NBA TV (480p)
+https://tx2.nexgen.bz/NBA/index.m3u8
+#EXTINF:-1 tvg-id="MSNBC.us",MSNBC (480p)
+https://tx1.nexgen.bz/MSNBC/index.m3u8
+#EXTINF:-1 tvg-id="MLBNetwork.us",MLB Network (480p)
+https://tx2.nexgen.bz/MLB/index.m3u8
+#EXTINF:-1 tvg-id="GolfChannel.us",NBC Golf (480p)
+https://tx1.nexgen.bz/GOLF/index.m3u8
+#EXTINF:-1 tvg-id="WPIXDT1.us",CW (WPIX) (480p)
+https://tx2.nexgen.bz/WPIX/index.m3u8
+#EXTINF:-1 tvg-id="WFORDT1.us",CBS (WFOR) (480p)
+https://tx1.nexgen.bz/CBS/index.m3u8
+#EXTINF:-1 tvg-id="WTVJDT1.us",NBC (WTVJ) (480p)
+https://tx1.nexgen.bz/NBC/index.m3u8
+#EXTINF:-1 tvg-id="WSVNDT1.us",FOX (WSVN) (720p)
+https://tx2.nexgen.bz/FOX/index.m3u8
+#EXTINF:-1 tvg-id="WPLGDT1.us",ABC (WPLG) (480p)
+https://tx1.nexgen.bz/ABC/index.m3u8
+#EXTINF:-1 tvg-id="KRISDT1.us",KRIS-DT1 (720p)
+https://content.uplynk.com/channel/f805c6ab7ddf4e2489ae648bb28fb133.m3u8
diff --git a/streams/us_30a.m3u b/streams/us_30a.m3u
index 9a7664d79..bf67ebf03 100644
--- a/streams/us_30a.m3u
+++ b/streams/us_30a.m3u
@@ -1,19 +1,19 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="30ADarcizzleOffshore.us",30A Darcizzle Offshore (720p)
 https://30a-tv.com/darcizzle.m3u8
-#EXTINF:-1 tvg-id="",30A Georgia Hollywood Review TV
+#EXTINF:-1 tvg-id="30AGeorgiaHollywoodReview.ca",30A Georgia Hollywood Review TV
 https://30a-tv.com/gh.m3u8
-#EXTINF:-1 tvg-id="",30A Golf Kingdom
+#EXTINF:-1 tvg-id="30AGolfKingdom.us",30A Golf Kingdom
 https://30a-tv.com/feeds/vidaa/golf.m3u8
 #EXTINF:-1 tvg-id="30AInvestmentPitch.us",30A Investment Pitch
 https://www.30a-tv.com/InvPit.m3u8
 #EXTINF:-1 tvg-id="30AInvestmentPitch.us",30A Investment Pitch (720p)
 https://30a-tv.com/feeds/xodglobal/30atv.m3u8
-#EXTINF:-1 tvg-id="",30A Lionel Nation TV
+#EXTINF:-1 tvg-id="30ALionelNation.us",30A Lionel Nation TV
 https://30a-tv.com/ln.m3u8
-#EXTINF:-1 tvg-id="",30A Loomered TV
+#EXTINF:-1 tvg-id="30ALoomeredTV.us",30A Loomered TV
 https://30a-tv.com/loomer.m3u8
-#EXTINF:-1 tvg-id="",30A Luxe Life Discovered
+#EXTINF:-1 tvg-id="30ALuxeLifeDiscovered.us",30A Luxe Life Discovered
 https://30a-tv.com/feeds/vidaa/luxelife.m3u8
 #EXTINF:-1 tvg-id="30AMusic.us",30A Music (720p)
 https://30a-tv.com/music.m3u8
@@ -21,11 +21,11 @@ https://30a-tv.com/music.m3u8
 https://30a-tv.com/feeds/ceftech/30atvmusic.m3u8
 #EXTINF:-1 tvg-id="30ASidewalks.us",30A Sidewalks (720p)
 https://30a-tv.com/sidewalks.m3u8
-#EXTINF:-1 tvg-id="",30A Television Channel
+#EXTINF:-1 tvg-id="30ATelevisionChannel.us",30A Television Channel
 https://30a-tv.com/feeds/masters/30atv.m3u8
 #EXTINF:-1 tvg-id="30ATheBeachShow.us",30A The Beach Show (720p)
 https://30a-tv.com/beachy.m3u8
-#EXTINF:-1 tvg-id="",30A TV Classic Movies
+#EXTINF:-1 tvg-id="30ATVClassicMovies.us",30A TV Classic Movies
 https://30a-tv.com/feeds/pzaz/30atvmovies.m3u8
-#EXTINF:-1 tvg-id="",30A We Love Cars
+#EXTINF:-1 tvg-id="30AWeLoveCars.us",30A We Love Cars
 https://30a-tv.com/feeds/vidaa/cars.m3u8
diff --git a/streams/us_3abn.m3u b/streams/us_3abn.m3u
index 9a3df9896..5f85f26c2 100644
--- a/streams/us_3abn.m3u
+++ b/streams/us_3abn.m3u
@@ -15,7 +15,7 @@ https://3abn.bozztv.com/3abn2/Kids_live/smil:Kids_live.smil/playlist.m3u8
 https://3abn.bozztv.com/3abn2/Lat_live/smil:Lat_live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="3ABNPraiseHimMusicNetwork.us",3ABN Praise Him Music Network
 https://3abn.bozztv.com/3abn1/PraiseHim/smil:PraiseHim.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",3ABN Proclaim! Network
+#EXTINF:-1 tvg-id="3ABNProclaimNetwork.us",3ABN Proclaim! Network
 https://3abn.bozztv.com/3abn2/Pro_live/smil:Pro_live.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="3ABNRussia.ru",Три Ангела
 https://3abn.bozztv.com/3abn2/Rus_live/smil:Rus_live.smil/playlist.m3u8
diff --git a/streams/us_amagi.m3u b/streams/us_amagi.m3u
index cea6672e2..d716662aa 100644
--- a/streams/us_amagi.m3u
+++ b/streams/us_amagi.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Newsmax 2 (1080p)
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax 2 (1080p)
 https://amg00217-newsmax-newsmax-zeasn-022k9.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="OANPlus.us",OANPlus (1080p)
 https://oan-plus-tcl.amagi.tv/playlist.m3u8
diff --git a/streams/us_cbsn.m3u b/streams/us_cbsn.m3u
index 5603540b2..1d23e0f2a 100644
--- a/streams/us_cbsn.m3u
+++ b/streams/us_cbsn.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",CBS News 24/7 (720p)
+#EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7 (720p)
 https://cbsn-us.cbsnstream.cbsnews.com/out/v1/55a8648e8f134e82a470f83d562deeca/master.m3u8
 #EXTINF:-1 tvg-id="CBSNewsBaltimore.us",CBS News Baltimore (720p)
 https://cbsnews.akamaized.net/hls/live/2099390/cbsnbal_11/master.m3u8
diff --git a/streams/us_distro.m3u b/streams/us_distro.m3u
index 9fc6d971e..2c0dc4972 100644
--- a/streams/us_distro.m3u
+++ b/streams/us_distro.m3u
@@ -5,7 +5,7 @@ https://distroscale-public.s3-us-west-2.amazonaws.com/strm/channels/darkmatter/v
 https://d3uyzhwvmemdyf.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/Hard-Knocks-DistroTV/109.m3u8
 #EXTINF:-1 tvg-id="HumorMill.us",Humor Mill (1080p) [Not 24/7]
 https://damkf751d85s1.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/HumorMill-DistroTV/152.m3u8
-#EXTINF:-1 tvg-id="",Newsmax 2 (720p)
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax 2 (720p)
 https://nmxdistro.akamaized.net/hls/live/529965/Live_1/index.m3u8
 #EXTINF:-1 tvg-id="TDAmeritradeNetwork.us",TD Ameritrade Network (1080p)
 https://tdameritrade-distro.amagi.tv/playlist.m3u8
diff --git a/streams/us_klowdtv.m3u b/streams/us_klowdtv.m3u
index d146a660b..9a8e1b644 100644
--- a/streams/us_klowdtv.m3u
+++ b/streams/us_klowdtv.m3u
@@ -69,7 +69,7 @@ https://bamus-klowdtv.amagi.tv/playlist.m3u8
 https://naviofrequency-sightline-klowdtv.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="NauticalChannel.it",Nautical Channel (720p)
 https://a-cdn.klowdtv.com/live2/nautical_720p/playlist.m3u8
-#EXTINF:-1 tvg-id="",Newsmax 2 (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax 2 (720p) [Geo-blocked]
 https://newsmax-klowdtv.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="OneAmericaNewsNetwork.us",OAN (720p)
 https://a-cdn.klowdtv.com/live1/oan_720p/playlist.m3u8
diff --git a/streams/us_pluto.m3u b/streams/us_pluto.m3u
index fb7650213..889e3ef86 100644
--- a/streams/us_pluto.m3u
+++ b/streams/us_pluto.m3u
@@ -129,7 +129,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/65
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60d393e5579a420007ee553c/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c276ad3-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=cde127fb-082c-4bae-bbc8-eb5fcecf263d
 #EXTINF:-1 tvg-id="Cats247.us",Cats 24/7
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/599375885ceaac3cabccbed7/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c276ad4-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=f1d9d30b-52fa-4979-a2d6-5066af724ab6
-#EXTINF:-1 tvg-id="",CBS News 24/7
+#EXTINF:-1 tvg-id="CBSNews247.us",CBS News 24/7
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5a6b92f6e22a617379789618/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c276ad5-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=36903a12-54e9-4279-a247-c026f64396a8
 #EXTINF:-1 tvg-id="CBSNewsBaltimore.us",CBS News Baltimore
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/60f75919718aed0007250d7a/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c276ad6-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c2c064a9-4fea-47dd-bfe1-339df4edb223
@@ -477,7 +477,7 @@ http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5d
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/6549306c83595c000815a696/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a5102-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=21e31328-eadb-4828-8608-0cc14ce24586
 #EXTINF:-1 tvg-id="News12NewYork.us",News 12 New York
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5fff49cfb5cd4f0007c2b0dc/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a5103-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=c438c5e4-4d4e-4037-8b44-c6782c44b796
-#EXTINF:-1 tvg-id="",Newsmax2
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax2
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/55b179af994403942f3061d6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a5104-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=1b86b942-5804-4df4-a9a2-24f45aaeb974
 #EXTINF:-1 tvg-id="NFLChannel.us",NFL Channel
 http://cfd-v4-service-channel-stitcher-use1-1.prd.pluto.tv/stitch/hls/channel/5ced7d5df64be98e07ed47b6/master.m3u8?appName=web&appVersion=unknown&clientTime=0&deviceDNT=0&deviceId=6c2a5105-30d3-11ef-9cf5-e9ddff8ff496&deviceMake=Chrome&deviceModel=web&deviceType=web&deviceVersion=unknown&includeExtendedEvents=false&serverSideAds=false&sid=6477ef85-3680-442c-94d8-27197903b1f6
diff --git a/streams/us_roku.m3u b/streams/us_roku.m3u
index 6fbbd5434..f41be635e 100644
--- a/streams/us_roku.m3u
+++ b/streams/us_roku.m3u
@@ -41,9 +41,9 @@ https://linear-59.frequency.stream/dist/roku/59/hls/master/playlist.m3u8
 https://olympusamagi.pc.cdn.bitgravity.com/Horrify-roku/master.m3u8
 #EXTINF:-1 tvg-id="iFoodTV.us",iFood.TV (1080p)
 https://ft-ifood-roku.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",iHeart 80s (1080p)
+#EXTINF:-1 tvg-id="IHeart80s.us",iHeart 80s (1080p)
 https://iheart-iheart80s-1-us.roku.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",iHeart 90s (1080p)
+#EXTINF:-1 tvg-id="IHeart90s.us",iHeart 90s (1080p)
 https://iheart-iheart90s-1-us.roku.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="JuntosTV.us",Juntos (1080p)
 https://olympusamagi.pc.cdn.bitgravity.com/Juntos-roku/master.m3u8
diff --git a/streams/us_samsung.m3u b/streams/us_samsung.m3u
index af4e49c5b..b2f616ed9 100644
--- a/streams/us_samsung.m3u
+++ b/streams/us_samsung.m3u
@@ -57,7 +57,7 @@ https://d3knca0xtk4ya9.cloudfront.net/v1/master/3722c60a815c199d9c0ef36c5b73da68
 https://moviesphere-samsung-samsungus.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="MyTimeMovieNetworkEast.us",MyTime Movie Network (1080p)
 https://mytimeuk-rakuten-samsung.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Newsmax 2 (1080p)
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax 2 (1080p)
 https://newsmax-samsungus.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="Pac12Insider.us",Pac 12 Insider (1080p)
 https://pac12-samsungus.amagi.tv/playlist.m3u8
diff --git a/streams/us_stirr.m3u b/streams/us_stirr.m3u
index 1bc68df50..8fbd3e727 100644
--- a/streams/us_stirr.m3u
+++ b/streams/us_stirr.m3u
@@ -71,7 +71,7 @@ https://d3p1dbb9xrkmd5.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d2
 https://amg09501-questar-amg09501c3-stirr-us-3096.playouts.now.amagi.tv/amg09501/AMG09501C3/segmented_playlist/0/35-89-3096.m3u8
 #EXTINF:-1 tvg-id="",Feva Music (1080p)
 https://d2y0xw9ugf4if7.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/STIRR-MuxIP-FEVAMusic/417.m3u8
-#EXTINF:-1 tvg-id="",Feva TV (1080p)
+#EXTINF:-1 tvg-id="FEVATV.ca",Feva TV (1080p)
 https://d3c1w351ahk83d.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/STIRR-MuxIP-FEVATV/416.m3u8
 #EXTINF:-1 tvg-id="FITE247.us",FITE 24/7 (1080p)
 https://d3d85c7qkywguj.cloudfront.net/v1/master/9d062541f2ff39b5c0f48b743c6411d25f62fc25/FiteTV-Nuestra/263.m3u8
diff --git a/streams/us_tubi.m3u b/streams/us_tubi.m3u
index 5c94d4737..203c6e27f 100644
--- a/streams/us_tubi.m3u
+++ b/streams/us_tubi.m3u
@@ -291,9 +291,9 @@ https://apollo.production-public.tubi.io/live/ac-gardening-monty-don.m3u8
 https://apollo.production-public.tubi.io/live/ac-gordon-ramsey.m3u8
 #EXTINF:-1 tvg-id="",Great British Menu (720p)
 https://apollo.production-public.tubi.io/live/ac-great-british-menu.m3u8
-#EXTINF:-1 tvg-id="",Grit Xtra (1080p)
+#EXTINF:-1 tvg-id="GritXtra.us",Grit Xtra (1080p)
 https://apollo.production-public.tubi.io/live/grit-extra.m3u8
-#EXTINF:-1 tvg-id="",Grit Xtra (1080p)
+#EXTINF:-1 tvg-id="GritXtra.us",Grit Xtra (1080p)
 https://livetv-fa.tubi.video/grit-extra/playlist.m3u8
 #EXTINF:-1 tvg-id="HauntTV.us",Haunt TV (720p)
 https://apollo.production-public.tubi.io/live/ac-haunttv.m3u8
diff --git a/streams/us_vizio.m3u b/streams/us_vizio.m3u
index c23e494e4..e2d1edc2b 100644
--- a/streams/us_vizio.m3u
+++ b/streams/us_vizio.m3u
@@ -43,7 +43,7 @@ https://legochannel-vizio.amagi.tv/playlist.m3u8
 https://mst3k-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="MyTimeMovieNetworkEast.us",MyTime Movie Network (1080p)
 https://mytime-vizio-ingest.cinedigm.com/playlist.m3u8
-#EXTINF:-1 tvg-id="",Newsmax 2 (1080p)
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax 2 (1080p)
 https://newsmax-vizio.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="OneAmericaNewsNetwork.us",OAN (1080p)
 https://oneamericanews-vizio.amagi.tv/playlist.m3u8
diff --git a/streams/us_wiseplayout.m3u b/streams/us_wiseplayout.m3u
index c339632fb..69b12ae95 100644
--- a/streams/us_wiseplayout.m3u
+++ b/streams/us_wiseplayout.m3u
@@ -51,7 +51,7 @@ https://lte.wiseplayout.com/WiseM3U8_11/master.m3u8
 https://lte.wiseplayout.com/WiseM3U8_26/master.m3u8
 #EXTINF:-1 tvg-id="",Ric+ (1080p)
 https://lte.wiseplayout.com/WiseM3U8_32/master.m3u8
-#EXTINF:-1 tvg-id="",Rugby Zone TV (1080p)
+#EXTINF:-1 tvg-id="RugbyZoneTV.fr",Rugby Zone TV (1080p)
 https://lte.wiseplayout.com/WiseM3U8_19/master.m3u8
 #EXTINF:-1 tvg-id="",Sacred Sites TV (1080p)
 https://lte.wiseplayout.com/WiseM3U8_20/master.m3u8
diff --git a/streams/us_xumo.m3u b/streams/us_xumo.m3u
index a0d6fecd3..b2d01b627 100644
--- a/streams/us_xumo.m3u
+++ b/streams/us_xumo.m3u
@@ -95,7 +95,7 @@ https://dai2.xumo.com/amagi_hls_data_xumo1212A-redbox-maverickmovies/CDN/playlis
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-viziomoovimex/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="NBCNewsNOW.us",NBC News Now (1080p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-xumo-nbcnewsnow/CDN/master.m3u8
-#EXTINF:-1 tvg-id="",Newsmax 2 (720p)
+#EXTINF:-1 tvg-id="Newsmax2.us",Newsmax 2 (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-newsmaxxumo/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="NitroCircus.us",Nitro Circus (720p)
 https://dai2.xumo.com/amagi_hls_data_xumo1212A-redboxnitrocircus/CDN/playlist.m3u8
diff --git a/streams/us_ythls.m3u b/streams/us_ythls.m3u
index c3b9d290f..09070a979 100644
--- a/streams/us_ythls.m3u
+++ b/streams/us_ythls.m3u
@@ -3,7 +3,7 @@
 https://ythls.armelin.one/channel/UCVEaAWKfv7fE1c-ZuBs7TKQ.m3u8
 #EXTINF:-1 tvg-id="1YesNews.in",1Yes News (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC3mHciwDcBC8XucNnRt9C6A.m3u8
-#EXTINF:-1 tvg-id="",2A TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="2ATV.sn",2A TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCh57LRfcD3Z4TK6WrzL39GA.m3u8
 #EXTINF:-1 tvg-id="2STV.sn",2S TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCeLEGbj240J6JhpP7ba8GwA.m3u8
@@ -21,7 +21,7 @@ https://ythls.armelin.one/channel/UCfymZbh17_3T_UhgjkQ9fRQ.m3u8
 https://ythls.armelin.one/channel/UCwALNfmBX8f2XKt2xe4PMBA.m3u8
 #EXTINF:-1 tvg-id="24Horas.cl",24 Horas (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCTXNz3gjAypWp3EhlIATEJQ.m3u8
-#EXTINF:-1 tvg-id="",24KZ (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="24KZ.kz",24KZ (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCnAFKvDuqBGkIfV8Vn0J_CQ.m3u8
 #EXTINF:-1 tvg-id="24News.in",24 News (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCup3etEdjyF1L3sRbU-rKLw.m3u8
@@ -29,11 +29,11 @@ https://ythls.armelin.one/channel/UCup3etEdjyF1L3sRbU-rKLw.m3u8
 https://ythls.armelin.one/channel/UCcmpeVbSSQlZRvHfdC-CRwg.m3u8
 #EXTINF:-1 tvg-id="92NewsHD.pk",92 News HD (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCsgC5cbz3DE2Shh34gNKiog.m3u8
-#EXTINF:-1 tvg-id="",96.3 Easy Rock (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="963EasyRock.ph",96.3 Easy Rock (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCZTlGPEnQ66TFG0m6Wa3KFQ.m3u8
 #EXTINF:-1 tvg-id="99TV.in",99TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCl5YgCiwSRVOiC2Nd1P9v1A.m3u8
-#EXTINF:-1 tvg-id="",313 Digital (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="313Digital.sn",313 Digital (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCkfPKgTSJljrXmwm1m0iY8Q.m3u8
 #EXTINF:-1 tvg-id="947.za",947 Joburg (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCYTTndlEZ-zBvVAxtayuNEA.m3u8
@@ -83,15 +83,15 @@ https://ythls.armelin.one/channel/UCtzTaKI8AkiSjyzm1_JbMUg.m3u8
 https://ythls.armelin.one/channel/UCNApqoVYJbYSrni4YsbXzyQ.m3u8
 #EXTINF:-1 tvg-id="AdomTV.gh",Adom TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCKlgbbF9wphTKATOWiG5jPQ.m3u8
-#EXTINF:-1 tvg-id="",Africanews English (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AfricanewsEnglish.fr",Africanews English (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC1_E8NeF5QHY2dtdLRBCCLA.m3u8
-#EXTINF:-1 tvg-id="",Africanews Français (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AfricanewsFrench.fr",Africanews Français (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC25EuGAePOPvPrUA5cmu3dQ.m3u8
 #EXTINF:-1 tvg-id="AfriqueMedia.cm",Afrique Média (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCOBMhI7TtRLTAGpcTjNvYCw.m3u8
 #EXTINF:-1 tvg-id="AgamvaniChannel.in",Agamvani Channel (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UClOK2dPmq8k8Xwii_4TjRnQ.m3u8
-#EXTINF:-1 tvg-id="",Ahlou Mouride TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AhlouMourideTV.sn",Ahlou Mouride TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCuFSrdYq5td__h886cSTmVw.m3u8
 #EXTINF:-1 tvg-id="AITInternational.ng",AIT International (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCKu6gqmaSudQI0YEfGvho2Q.m3u8
@@ -103,7 +103,7 @@ https://ythls.armelin.one/channel/UCdq-DJ5MS7qjd1aXPFg71Yg.m3u8
 https://ythls.armelin.one/channel/UCV01ajGl6nt09h40iDoHDNg.m3u8
 #EXTINF:-1 tvg-id="AlGhadTV.eg",Al Ghad (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCH4UNKBHSNwstan99YDoCVg.m3u8
-#EXTINF:-1 tvg-id="",Al Hadath TV (1080p)
+#EXTINF:-1 tvg-id="AlHadath.sa",Al Hadath TV (1080p)
 https://ythls.armelin.one/channel/UCrj5BGAhtWxDfqbza9T9hqA.m3u8
 #EXTINF:-1 tvg-id="AlHudaTV.ke",Al Huda TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCdTAsRrQEp-IVoMzKoRG4ZQ.m3u8
@@ -113,7 +113,7 @@ https://ythls.armelin.one/channel/UCfiwzLy-8yKzIbsmZTzxDgw.m3u8
 https://ythls.armelin.one/channel/UCNye-wNBqNL5ZzHSJj3l8Bg.m3u8
 #EXTINF:-1 tvg-id="AlKaheraWalNas.eg",Al Kahera Wal Nas (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCzWdc0aUo0IDk5ysLrt04hw.m3u8
-#EXTINF:-1 tvg-id="",Al Khadimiyyah TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="AlKhadimiyyahTV.sn",Al Khadimiyyah TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCqbQTS505CVDNNmPI0KwoYA.m3u8
 #EXTINF:-1 tvg-id="AlMashhad.ae",Al Mashhad (1080p)
 https://ythls.armelin.one/channel/UCWnBTuzUUDpKhJPGuDQMynA.m3u8
@@ -185,7 +185,7 @@ https://ythls.armelin.one/channel/UCMDzPE_7fcZSRJgpwIVor_A.m3u8
 https://ythls.armelin.one/channel/UCQ8kxAu_on_YzVPMjB03rqA.m3u8
 #EXTINF:-1 tvg-id="AwazTVNetwork.pk",Awaz TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCd0sEeyvD_K9YYw0yPTKDhw.m3u8
-#EXTINF:-1 tvg-id="",Ayaat (720p)
+#EXTINF:-1 tvg-id="Ayat.sa",Ayaat (720p)
 https://ythls.armelin.one/channel/UC89SSMnCKzXdZsIs_GB6QBg.m3u8
 #EXTINF:-1 tvg-id="AZMTV.ar",AZM TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCf0t3JPPILv3Pt4GiWwU3Ew.m3u8
@@ -215,11 +215,11 @@ https://ythls.armelin.one/channel/UCSzOZ97LOpU-_AVlGfmD4rQ.m3u8
 https://ythls.armelin.one/channel/UCCQmi1Bd-_tHRm6M2uPlGUA.m3u8
 #EXTINF:-1 tvg-id="",BibleVision Français (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC5qnsycDaMxkHe5YaWwhw3g.m3u8
-#EXTINF:-1 tvg-id="",Bichri TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="BichriTV.sn",Bichri TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCrtdAWf9y1D2by4ruhWbllA.m3u8
 #EXTINF:-1 tvg-id="BloombergHT.tr",Bloomberg HT (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCApLxl6oYQafxvykuoC2uxQ.m3u8
-#EXTINF:-1 tvg-id="",Blu Radio (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="BluRadio.co",Blu Radio (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCUYokk2dJxFZf7NgxTL-ROg.m3u8
 #EXTINF:-1 tvg-id="BoaVontadeTV.br",Boa Vontade TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCedt33latJW7StRfdF4-1FQ.m3u8
@@ -227,7 +227,7 @@ https://ythls.armelin.one/channel/UCedt33latJW7StRfdF4-1FQ.m3u8
 https://ythls.armelin.one/channel/UCz2yxQJZgiB_5elTzqV7FiQ.m3u8
 #EXTINF:-1 tvg-id="BTBHD.pl",Bombaska Telewizja Boża (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCNmXUDT4hoiHhtzPvCfJOeQ.m3u8
-#EXTINF:-1 tvg-id="",Bostra TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="BostraTV.fr",Bostra TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCYEWRYZaggmEj0lFzmwf7Jg.m3u8
 #EXTINF:-1 tvg-id="BSNYouTube.jp",BSN (Youtube) (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCoAQNKxgfE32ai4mOXNXvug.m3u8
@@ -249,7 +249,7 @@ https://ythls.armelin.one/channel/UCzescUFTh2jiZkYIx9uZtqA.m3u8
 https://ythls.armelin.one/channel/UCyM7oro5NhR5oPyMEFB_rUA.m3u8
 #EXTINF:-1 tvg-id="Canal2.ni",Canal 2 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCX2i6sAexuDAbHMztLnfnKg.m3u8
-#EXTINF:-1 tvg-id="",Canal 6 ERTV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="Canal6EntreRiosTV.ar",Canal 6 ERTV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCgj6Vesuxfr_fVEp-rG5sxQ.m3u8
 #EXTINF:-1 tvg-id="Canal7Chubut.ar",Canal 7 Chubut (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCfmLIFSQSQ-4y9Jgn93nefA.m3u8
@@ -339,17 +339,17 @@ https://ythls.armelin.one/channel/UC_DweJsPH4mvcRU3aFwVtqg.m3u8
 https://ythls.armelin.one/channel/UCsba91UGiQLFOb5DN3Z_AdQ.m3u8
 #EXTINF:-1 tvg-id="CNBCArabiya.ae",CNBC Arabia (1080p)
 https://ythls.armelin.one/channel/UCsHdPPJXT-yKVTLGkn3DSvQ.m3u8
-#EXTINF:-1 tvg-id="",CNBC Awaaz (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CNBCAwaaz.pk",CNBC Awaaz (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCQIycDaLsBpMKjOCeaKUYVg.m3u8
 #EXTINF:-1 tvg-id="CNBCTV18.in",CNBC TV18 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCmRbHAgG2k2vDUvb3xsEunQ.m3u8
 #EXTINF:-1 tvg-id="CNNNews18.in",CNN News 18 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCef1-8eOpJgud7szVPlZQAQ.m3u8
-#EXTINF:-1 tvg-id="",Congo Live TV (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CongoLiveTV.cd",Congo Live TV (480p) [Not 24/7]
 https://ythls.armelin.one/channel/UCU9aU4RtgSnB5elKQYGjFuQ.m3u8
 #EXTINF:-1 tvg-id="CongresoTV.pe",Congreso TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCsKiP5cZCYh9YhPGrI6GrkQ.m3u8
-#EXTINF:-1 tvg-id="",CreaLaTV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CreaLaTV.mx",CreaLaTV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCL1iKKBxY_iPu7iH-1wNdwQ.m3u8
 #EXTINF:-1 tvg-id="CronicaTV.ar",Crónica TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCT7KFGv6s2a-rh2Jq8ZdM1g.m3u8
@@ -369,9 +369,9 @@ https://ythls.armelin.one/channel/UCj3dt20MAZcvDN8GKeT2FBg.m3u8
 https://ythls.armelin.one/channel/UCungvaPJaa_kDLxZBYXzpsQ.m3u8
 #EXTINF:-1 tvg-id="CVRNews.in",CVR News Telugu (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCixD-KrpjXtMupkzkdFFlFg.m3u8
-#EXTINF:-1 tvg-id="",DakarActu TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="DakarActuTV.sn",DakarActu TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCG0t6XiAHui-ziz7SwFTN0g.m3u8
-#EXTINF:-1 tvg-id="",DanmarkC TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="DanmarkCTV.dk",DanmarkC TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UC582CKg7XN_ELMyKiSZ8s9g.m3u8
 #EXTINF:-1 tvg-id="DawnNews.pk",Dawn News (720p)
 https://ythls.armelin.one/channel/UCaxR-D8FjZ-2otbU0_Y2grg.m3u8
@@ -421,9 +421,9 @@ https://ythls.armelin.one/channel/UChMCkc02GVSi89TrvhbRasA.m3u8
 https://ythls.armelin.one/channel/UCQGN5-eIjRRy6MGcHKDE_6g.m3u8
 #EXTINF:-1 tvg-id="DeporTV.ar",DeporTV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCSmh3DFxBwFurMttT60PQ1g.m3u8
-#EXTINF:-1 tvg-id="",Dhaaris TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="DhaarisTV.mv",Dhaaris TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCmTIhD3NGdWo04RlF91L4uw.m3u8
-#EXTINF:-1 tvg-id="",Dimtsi Weyane TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="DimtsiWeyaneTV.et",Dimtsi Weyane TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCv2j8jQyHVi6rTr1HDezP3g.m3u8
 #EXTINF:-1 tvg-id="DiputadosTV.ar",Diputados TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UC1h8_HKc5wScqeRw1HV6a6w.m3u8
@@ -439,7 +439,7 @@ https://ythls.armelin.one/channel/UCmYNKMD89Xaxnqg2t-LeZgQ.m3u8
 https://ythls.armelin.one/channel/UCEXUo0sBf0_w8rnckXuBcFA.m3u8
 #EXTINF:-1 tvg-id="DRTSTV.sn",DRTS TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC-6dz560kcpeLmxceZzn44A.m3u8
-#EXTINF:-1 tvg-id="",Dublin Community Television (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="DublinCommunityTelevision.ie",Dublin Community Television (480p) [Not 24/7]
 https://ythls.armelin.one/channel/UCUETw12rMj3GP4FQ1SbEukQ.m3u8
 #EXTINF:-1 tvg-id="DunyaNews.pk",Dunya News (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCnMBV5Iw4WqKILKue1nP6Hg.m3u8
@@ -449,7 +449,7 @@ https://ythls.armelin.one/channel/UC30ditU5JI16o5NbFsHde_Q.m3u8
 https://ythls.armelin.one/channel/UCknLrEdhRCp1aegoMqRaCZg.m3u8
 #EXTINF:-1 tvg-id="DZRHNewsTV.ph",DZRH News TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCcTiBX8js_djhSSlmJRI99A.m3u8
-#EXTINF:-1 tvg-id="",EàDTV CONGO (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="EaDTVCONGO.cg",EàDTV CONGO (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCdBQfm4truef3mDSYHDS0ig.m3u8
 #EXTINF:-1 tvg-id="earthTV.de",earthTV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCRuyAVeVd7oUwh0LWmxxBBQ.m3u8
@@ -559,7 +559,7 @@ https://ythls.armelin.one/channel/UCqGxkgVnPc7arUR7MdCi99g.m3u8
 https://ythls.armelin.one/channel/UCoRq_Eg3xg4Ed0NJKhRYiQA.m3u8
 #EXTINF:-1 tvg-id="",GEGAR (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCd4d3fL-QZPCd9vMiUFhXLQ.m3u8
-#EXTINF:-1 tvg-id="",GemeindeTV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="GemeindeTV.at",GemeindeTV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCbGaZEFvBLMe8eNgoBFDRZg.m3u8
 #EXTINF:-1 tvg-id="GipsyTvWien.at",GipsyTv Wien (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCDQ8ziK0-ANT-F906M71dJg.m3u8
@@ -589,7 +589,7 @@ https://ythls.armelin.one/channel/UC81VkX0QeICZw7o2jMwGThg.m3u8
 https://ythls.armelin.one/channel/UCtc-a9ZUIg0_5HpsPxEO7Qg.m3u8
 #EXTINF:-1 tvg-id="HaitiViralNews.ht",Haiti Viral News (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCcEY2-g-EEefxyYa1gtrk4g.m3u8
-#EXTINF:-1 tvg-id="",Halab Today TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="HalabTodayTV.tr",Halab Today TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCnh5Faqn_r9HxeNd_dsvGHQ.m3u8
 #EXTINF:-1 tvg-id="HarKhabar.in",Har Khabar (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCkfMPrLxnaGaKon4ccRJ9Tg.m3u8
@@ -599,7 +599,7 @@ https://ythls.armelin.one/channel/UCZ8S3qwowiFztAQBRTawWfA.m3u8
 https://ythls.armelin.one/channel/UCSe8uUIt3EM83y9N0WHSx_w.m3u8
 #EXTINF:-1 tvg-id="HBCHokkaidoNews24.jp",HBC Hokkaido News 24 (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCCTpf5c_9HDo_OSu3aX8uFQ.m3u8
-#EXTINF:-1 tvg-id="",Heaven TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="HeavenTV.et",Heaven TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCh3XDyQK9Cc-qgSzYq5uxwQ.m3u8
 #EXTINF:-1 tvg-id="HermesTVVigo.es",Hermes TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCv_HqaMNADVSi7A3jLrVPsA.m3u8
@@ -667,7 +667,7 @@ https://ythls.armelin.one/channel/UCaFBF255LGHwqSB35kN7jsA.m3u8
 https://ythls.armelin.one/channel/UC4jYxQXFqB5q6INV6WEQC2A.m3u8
 #EXTINF:-1 tvg-id="",ISSO New Zealand Daily Darshan Auckland (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCXvs0ohLDctzFbbEGCQg-rQ.m3u8
-#EXTINF:-1 tvg-id="",Istikhama TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="IstikhamaTV.sn",Istikhama TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCIpj2Vtw2GkXEfhevrAbkCQ.m3u8
 #EXTINF:-1 tvg-id="IwateMenkoiTelevision.jp",Iwate Menkoi Television (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCw14eNQAUDqCg-fX3Uvd07w.m3u8
@@ -745,13 +745,13 @@ https://ythls.armelin.one/channel/UCCc2H9_eNnU7ucq2n7Sh3Rg.m3u8
 https://ythls.armelin.one/channel/UCba3hpU7EFBSk817y9qZkiA.m3u8
 #EXTINF:-1 tvg-id="",La Petite Sorcière Tanny
 https://ythls.armelin.one/channel/UC1VGGT9RfunvCdvZf_gqVBg.m3u8
-#EXTINF:-1 tvg-id="",La Redonda TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="LaRedondaTV.ec",La Redonda TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCG_S--F4wcdre2-8PG9YlhA.m3u8
 #EXTINF:-1 tvg-id="LadanyTV.hu",Ladány TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCnG322MGBA4q5QWwDzUTh0Q.m3u8
 #EXTINF:-1 tvg-id="LaudatoTV.hr",Laudato TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCMNltXN6fWur0K8Z1oubFPA.m3u8
-#EXTINF:-1 tvg-id="",Le Média TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="LeMediaTV.fr",Le Média TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCT67YOMntJxfRnO_9bXDpvw.m3u8
 #EXTINF:-1 tvg-id="LejelHomeShopping.id",Lejel Home Shopping (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC9q_4Ljmm0C15j25Bqx1ZOw.m3u8
@@ -765,7 +765,7 @@ https://ythls.armelin.one/channel/UCzDknC7OXx6l9eEsgugjU2w.m3u8
 https://ythls.armelin.one/channel/UC2ut_DrUZvO0BzUxZ_g9fXQ.m3u8
 #EXTINF:-1 tvg-id="LoriaTV.ad",Lòria TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCCCnrECJpv84QKM4olodZOQ.m3u8
-#EXTINF:-1 tvg-id="",Lou'Bess TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="LouBessTV.sn",Lou'Bess TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCkEyFrOg61vOOEfG6pdRINg.m3u8
 #EXTINF:-1 tvg-id="M1.hu",M1 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCHJ8gW2vKH5R3VohymtBCrQ.m3u8
@@ -779,7 +779,7 @@ https://ythls.armelin.one/channel/UCrJDHlh0u9KdOB7A559n7uA.m3u8
 https://ythls.armelin.one/channel/UCoMWImnPAur6JhXDK63dpAg.m3u8
 #EXTINF:-1 tvg-id="Malaimurasu.in",Malaimurasu (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCXbufH95DIUqyAWSzeDI0JQ.m3u8
-#EXTINF:-1 tvg-id="",Malikia TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="MalikiaTV.sn",Malikia TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UC0V1TlLFybhr0MJzxxXgdWw.m3u8
 #EXTINF:-1 tvg-id="ManoramaNews.in",Manorama News
 https://ythls.armelin.one/channel/UCP0uG-mcMImgKnJz-VjJZmQ.m3u8
@@ -839,13 +839,13 @@ https://ythls.armelin.one/channel/UC4LjkybVKXCDlneVXlKAbmw.m3u8
 https://ythls.armelin.one/channel/UC_TKzHKWqX7sAjx4UPZoAPA.m3u8
 #EXTINF:-1 tvg-id="MosaikCristal.fr",Mosaik Cristal
 https://ythls.armelin.one/channel/UCQC0xLG_W0QpqAXQ4-yhwBA.m3u8
-#EXTINF:-1 tvg-id="",Mourchid TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MourchidTV.sn",Mourchid TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCd4M7knaiPnAtfN28qm7Q9w.m3u8
-#EXTINF:-1 tvg-id="",Munara TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="MunaraTV.kz",Munara TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UC4tTvzqFKK2Dpfp-qP47b1w.m3u8
 #EXTINF:-1 tvg-id="",MY (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCRzAqsmluZYk-r59pQYSa3Q.m3u8
-#EXTINF:-1 tvg-id="",National Gold TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="NationalGoldTV.np",National Gold TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC1SeIQsJZSyo09PRq9zJz_w.m3u8
 #EXTINF:-1 tvg-id="Net2TV.gh",Net2 TV (360p) [Not 24/7]
 https://ythls.armelin.one/channel/UCKpFgDhnwRvUauqsd5h98fw.m3u8
@@ -853,7 +853,7 @@ https://ythls.armelin.one/channel/UCKpFgDhnwRvUauqsd5h98fw.m3u8
 https://ythls.armelin.one/channel/UC5IF8NlxMW1GkEUUqWJJBIw.m3u8
 #EXTINF:-1 tvg-id="NET.id",NET. [Not 24/7]
 https://ythls.armelin.one/channel/UC1-ATnDVEwKT6-0aEeJ2ibA.m3u8
-#EXTINF:-1 tvg-id="",Nethra TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="NethraTV.lk",Nethra TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UC6b6XrsNOxQiS-FdfE8-Avw.m3u8
 #EXTINF:-1 tvg-id="NewLifeTV.ke",New Life TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCk3buHLJP6KAcbtsw8fj4hg.m3u8
@@ -897,11 +897,11 @@ https://ythls.armelin.one/channel/UCjG2HX7jfwqIjzTlaF1CPGA.m3u8
 https://ythls.armelin.one/channel/UCPLKy4Ypb4mfblbjJI8Aljw.m3u8
 #EXTINF:-1 tvg-id="NewsJ.in",News J (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCsfh2Zb7-m4qzT8jLhK_Fzw.m3u8
-#EXTINF:-1 tvg-id="",News Malayalam 24x7
+#EXTINF:-1 tvg-id="NewsMalayalam24x7.in",News Malayalam 24x7
 https://ythls.armelin.one/channel/UCXp6JTdq7-WwBK09S7SzmxQ.m3u8
 #EXTINF:-1 tvg-id="NewsNation.in",News Nation (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCsNdeLwEZf86swPD3qJJ7Dw.m3u8
-#EXTINF:-1 tvg-id="",News Nepal TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="NewsNepalTV.np",News Nepal TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCjrSauhXmf4P1q1YLcrnetA.m3u8
 #EXTINF:-1 tvg-id="NewsOne.pk",News One (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCjHWKUbljF4hp3s5PbgK9uA.m3u8
@@ -925,7 +925,7 @@ https://ythls.armelin.one/channel/UC2Xq2PK-got3Rtz9ZJ32hLQ.m3u8
 https://ythls.armelin.one/channel/UCjYCgkpX1eQCTne99oT63yA.m3u8
 #EXTINF:-1 tvg-id="Nova24TV2.si",Nova24TV 2 (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCOGseusAY1nMkEhpmmz6Mmg.m3u8
-#EXTINF:-1 tvg-id="",Novo Tempo Portugal (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="NovoTempoPortugal.pt",Novo Tempo Portugal (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCm0_NzofPCXJ44djiyz_uBg.m3u8
 #EXTINF:-1 tvg-id="NTANews24.ng",NTA News 24 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCLLWAXn5F415g2kNAcE_T1g.m3u8
@@ -959,7 +959,7 @@ https://ythls.armelin.one/channel/UCi-vOBG7Jgk_nKAG1Zd0R5g.m3u8
 https://ythls.armelin.one/channel/UC6E1pvhGa55AaZ-svF70ViA.m3u8
 #EXTINF:-1 tvg-id="ParliamentofKenya.ke",Parliament of Kenya (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCXuseB7juWB7DIgTJcwtHFQ.m3u8
-#EXTINF:-1 tvg-id="",Parole Parlée TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="ParoleParleeTV.ci",Parole Parlée TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCTWC45fM79-R8wFQPosO1xg.m3u8
 #EXTINF:-1 tvg-id="PatrikaRajasthan.in",Patrika Rajashtan (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCWk-7Yosyvzln9ZzJg8BvVg.m3u8
@@ -1015,7 +1015,7 @@ https://ythls.armelin.one/channel/UC5RvV_LtR1dxPCVFGw6dxXA.m3u8
 https://ythls.armelin.one/channel/UCj-e7yp2_-qE-TPritppZGQ.m3u8
 #EXTINF:-1 tvg-id="PublicNews.pk",Public News (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCElJZvY_RVra6qjD8WSQYog.m3u8
-#EXTINF:-1 tvg-id="",Puissance Télévision (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="PuissanceTV.fr",Puissance Télévision (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCxSUslP_JMH3Bb50oXd1Nnw.m3u8
 #EXTINF:-1 tvg-id="PuthiyaThalaimurai.in",Puthiya Thalaimurai (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCmyKnNRH0wH-r8I-ceP-dsg.m3u8
@@ -1039,7 +1039,7 @@ https://ythls.armelin.one/channel/UCLeNHM8XDkZmd2rhV3ZG7Vg.m3u8
 https://ythls.armelin.one/channel/UCBJ9zxns1hxblYZw4urBd_w.m3u8
 #EXTINF:-1 tvg-id="RadioUnoTacna.pe",Radio Uno Tacna (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCK0lpuL9PQb3I5CDcu7Y7bA.m3u8
-#EXTINF:-1 tvg-id="",Radyo Bandido TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RadyoBandidoTV.ph",Radyo Bandido TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC1f5yN0Hdibzm3JqqUswKvA.m3u8
 #EXTINF:-1 tvg-id="RajNews24x7.in",Raj News Tamil (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC1mkFVHzP87YQ87PSMxo9MQ.m3u8
@@ -1055,7 +1055,7 @@ https://ythls.armelin.one/channel/UCotIkyDFzztbSm21GNGsK9w.m3u8
 https://ythls.armelin.one/channel/UCnPwQV0-W7S02i_omPEpJBg.m3u8
 #EXTINF:-1 tvg-id="RCTVDigital.pa",RCTV Digital (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCvB04bwxAyvBf2CiU0eDN0A.m3u8
-#EXTINF:-1 tvg-id="",RED Television (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="REDTelevision.np",RED Television (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCOAiQGUpfevEk5GEBDajayw.m3u8
 #EXTINF:-1 tvg-id="RedeInternacionaldeTV.br",Rede Internacional de TV (RIT TV) (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCA0bOG0NUfJ855eDtHSxOkw.m3u8
@@ -1113,7 +1113,7 @@ https://ythls.armelin.one/channel/UCiAH2s_M6nPfGZk-PpfyPkg.m3u8
 https://ythls.armelin.one/channel/UCISgnSNwqQ2i8lhCun3KtQg.m3u8
 #EXTINF:-1 tvg-id="SasaTV.ke",Sasa TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCrBGAWr24pPQn-HUWZDBelQ.m3u8
-#EXTINF:-1 tvg-id="",Sathi TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SathiTV.lk",Sathi TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCj-bQzHpWB5MtmJoDzizzbw.m3u8
 #EXTINF:-1 tvg-id="SathiyamTV.in",Sathiyam TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UC2ziCMHFPWkFHjocUMXT__Q.m3u8
@@ -1177,13 +1177,13 @@ https://ythls.armelin.one/channel/UCYlh4lH762HvHt6mmiecyWQ.m3u8
 https://ythls.armelin.one/channel/UCyDiTtktwmrc20Bvs_G4pow.m3u8
 #EXTINF:-1 tvg-id="SunoNewsHD.pk",Suno News HD (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCB82Zom1MYh8VV4q7wXkfGA.m3u8
-#EXTINF:-1 tvg-id="",Sunugal 24 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Sunugal24.sn",Sunugal 24 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCAUXyESHY44j2QOLUsm5fAg.m3u8
 #EXTINF:-1 tvg-id="",Super Truck Français
 https://ythls.armelin.one/channel/UC4u2o6tyE4vTrErXY9AN6Rw.m3u8
 #EXTINF:-1 tvg-id="Suria.sg",SuriaTV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCjDM2C3nXPGD_cGDyrrBT6w.m3u8
-#EXTINF:-1 tvg-id="",Sutra TV (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="SutraTV.np",Sutra TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCAqc7EsDfuWb29hao5wN4nA.m3u8
 #EXTINF:-1 tvg-id="SuvarnaNews.in",Suvarna News (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCjElJyiXmQXnWmceQ1JyKrA.m3u8
@@ -1199,7 +1199,7 @@ https://ythls.armelin.one/channel/UC7c6rvyAZLpKGk8ttVnpnLA.m3u8
 https://ythls.armelin.one/channel/UCEz71zXmApKBYiH1fReemeA.m3u8
 #EXTINF:-1 tvg-id="TBSeFM.kr",TBS eFM (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCHjDAeTbO4fQilomLD-kaXg.m3u8
-#EXTINF:-1 tvg-id="",TBS News Dig (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TBSNewsDig.jp",TBS News Dig (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC6AG81pAkf6Lbi_1VC5NmPA.m3u8
 #EXTINF:-1 tvg-id="TSN.ua",TCH (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCXoJ8kY9zpLBEz-8saaT3ew.m3u8
@@ -1207,7 +1207,7 @@ https://ythls.armelin.one/channel/UCXoJ8kY9zpLBEz-8saaT3ew.m3u8
 https://ythls.armelin.one/channel/UCoHnRpOS5rL62jTmSDO5Npw.m3u8
 #EXTINF:-1 tvg-id="TeleCongo.cg",Télé Congo (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCOHlkoGLAPzblZ5i-p5dSEA.m3u8
-#EXTINF:-1 tvg-id="",Télé Sénégal (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="TeleSenegalTV.sn",Télé Sénégal (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCfwCPzdT1i87xWYh1P3suTw.m3u8
 #EXTINF:-1 tvg-id="TeleMagQuebec.ca",Télé-Mag Québec (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCNKXYT-Nng5LBMUQrZJ9zWA.m3u8
@@ -1335,7 +1335,7 @@ https://ythls.armelin.one/channel/UCcqFHIDYfKsaJ5KXZjzW7ZQ.m3u8
 https://ythls.armelin.one/channel/UC5GvVahlgulCyo4cshSmbcg.m3u8
 #EXTINF:-1 tvg-id="TrustTV.ng",Trust TV (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCTlqstA2Wrt4fimd_VWKr8g.m3u8
-#EXTINF:-1 tvg-id="",Truth Channel (1080p) [Not 24/7]
+#EXTINF:-1 tvg-id="TruthChannel.ph",Truth Channel (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCa3hzYljDByZxkjIMah_2nw.m3u8
 #EXTINF:-1 tvg-id="TTVNews.tw",TTV News (台视新聞台)
 https://ythls.armelin.one/channel/UC8ROUUjHzEQm-ndb69CX8Ww.m3u8
@@ -1443,7 +1443,7 @@ https://ythls.armelin.one/channel/UCA2f1lPcwYpBKA4JBMBHDSQ.m3u8
 https://ythls.armelin.one/channel/UC3XaG-7UVi2vD8ZZEMNnnpw.m3u8
 #EXTINF:-1 tvg-id="UruguayPresidencia.uy",Uruguay Presidencia (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCz1Li9JcQB9XP-HfgN0IYLQ.m3u8
-#EXTINF:-1 tvg-id="",V6AH (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="V6AH.fm",V6AH (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UC103DbQcwFPuaCF4pleV7rw.m3u8
 #EXTINF:-1 tvg-id="V6News.in",V6 News (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCDCMjD1XIAsCZsYHNMGVcog.m3u8
@@ -1467,11 +1467,11 @@ https://ythls.armelin.one/channel/UCGYSq4b4DXmtK4jyq6r-FYg.m3u8
 https://ythls.armelin.one/channel/UCmMPdW0rtbEI_XyIsMlMnqg.m3u8
 #EXTINF:-1 tvg-id="VenusHD.pk",Venus HD (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCau2UiIsh9Ak34pgrqm3J0w.m3u8
-#EXTINF:-1 tvg-id="",Veritas 846 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Veritas846.ph",Veritas 846 (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UCAzUdEY3ZqtcC_s4ZdDKm7Q.m3u8
 #EXTINF:-1 tvg-id="VismayaNews.in",Vision (1080p)
 https://ythls.armelin.one/channel/UCoOQDJS5K6v3g__qPcullxg.m3u8
-#EXTINF:-1 tvg-id="",VOICI L'HOMME TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="VOICILHOMMETV.cd",VOICI L'HOMME TV (720p) [Not 24/7]
 https://ythls.armelin.one/channel/UChinnBvzSaDcPjRhSBqMjzQ.m3u8
 #EXTINF:-1 tvg-id="Vorterix.ar",Vorterix (1080p) [Not 24/7]
 https://ythls.armelin.one/channel/UCvCTWHCbBC0b9UIeLeNs8ug.m3u8
diff --git a/streams/uy.m3u b/streams/uy.m3u
index e9cee3866..3c7ca6df8 100644
--- a/streams/uy.m3u
+++ b/streams/uy.m3u
@@ -1,11 +1,11 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",Canal ALMA (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="CanalALMA.uy",Canal ALMA (720p) [Not 24/7]
 https://live.cloudhostservers.com:3486/stream/play.m3u8
 #EXTINF:-1 tvg-id="CanalMas.uy",Canal Más (720p)
 https://tvlive.servicioselbachi.com:3686/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="CharruaTelevision.uy",Charrúa Televisión (720p)
 https://stmv.video.gmpro.top/tvcharrua/tvcharrua/playlist.m3u8
-#EXTINF:-1 tvg-id="",Del Este TV (720p)
+#EXTINF:-1 tvg-id="DelEsteTV.uy",Del Este TV (720p)
 https://stream.oursnetworktv.com/latin/estetvo/playlist.m3u8
 #EXTINF:-1 tvg-id="LaRed.uy",La Red (720p) [Not 24/7]
 https://stm1.rootuy.xyz:19360/sdredtv/sdredtv.m3u8
diff --git a/streams/ve.m3u b/streams/ve.m3u
index 1da45f9ef..6d9350dbe 100644
--- a/streams/ve.m3u
+++ b/streams/ve.m3u
@@ -8,7 +8,7 @@ https://cloud2.streaminglivehd.com:1936/8264/8264/playlist.m3u8
 #EXTINF:-1 tvg-id="AvilaTV.ve",Ávila TV (Caracas) (1080p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://odysee.com/
 https://cloud.odysee.live/content/9fc00ad00fd8b0f08ab11f2324c82ffd713c3cb6/master.m3u8
-#EXTINF:-1 tvg-id="",Barinas TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="BarinasTV.ve",Barinas TV (720p) [Not 24/7]
 https://vcp13.myplaytv.com/barinastv/barinastv/playlist.m3u8
 #EXTINF:-1 tvg-id="BTATV.ve",BTA TV (720p)
 https://cloud.fastchannel.es/manifiest/hls/prog9/btatv.m3u8
@@ -56,33 +56,33 @@ https://vcp.myplaytv.com/italianissimo/italianissimo/playlist.m3u8
 https://streamtv.intervenhosting.net:3718/live/kandelamedioslive.m3u8
 #EXTINF:-1 tvg-id="LatinaTV.ve",Latina TV (1080p)
 https://streamtv.intervenhosting.net:3639/live/latinatvlive.m3u8
-#EXTINF:-1 tvg-id="",LGD TV (1080p)
+#EXTINF:-1 tvg-id="LGDTelevision.ve",LGD TV (1080p)
 https://streamtv.intervenhosting.net:3259/hybrid/play.m3u8
 #EXTINF:-1 tvg-id="MasTalk.ve",Más Talk (1080p)
 https://vod2live.univtec.com/manifest/89290956-94ab-4950-accb-a54bbd7e176f.m3u8
-#EXTINF:-1 tvg-id="",MAX Anime (720p)
+#EXTINF:-1 tvg-id="MAXAnime.ve",MAX Anime (720p)
 https://vcp14.myplaytv.com/maxanime/maxanime/playlist.m3u8
 #EXTINF:-1 tvg-id="MDATelevision.ve",MDA Televisión (720p)
 https://vcp.myplaytv.com/mdatv/mdatv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Monagas Visión (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MonagasVision.ve",Monagas Visión (720p) [Not 24/7]
 https://cloud2.streaminglivehd.com:1936/monagasvision/monagasvision/playlist.m3u8
-#EXTINF:-1 tvg-id="",Oasis Televisión (720p)
+#EXTINF:-1 tvg-id="OasisTelevision.ve",Oasis Televisión (720p)
 http://vcp1.myplaytv.com/oasistv/oasistv/playlist.m3u8
-#EXTINF:-1 tvg-id="",Onza TV (720p)
+#EXTINF:-1 tvg-id="OnzaTV.ve",Onza TV (720p)
 https://stmv1.srvstm.com/gproducciones/gproducciones/playlist.m3u8
 #EXTINF:-1 tvg-id="OxigenoTV.ve",Oxigeno TV (360p) [Not 24/7]
 https://vcp.myplaytv.com/oxigenotv/oxigenotv/playlist.m3u8
 #EXTINF:-1 tvg-id="Panavision.ve",Panavisión (1080p)
 https://vcp.myplaytv.com/panavision/panavision/playlist.m3u8
-#EXTINF:-1 tvg-id="",PLTV (614p)
+#EXTINF:-1 tvg-id="PLTV.ve",PLTV (614p)
 https://vcp2.myplaytv.com/pltv/pltv/playlist.m3u8
-#EXTINF:-1 tvg-id="",PortuTV (480p)
+#EXTINF:-1 tvg-id="PortuguesaTelevision.ve",PortuTV (480p)
 https://streamtv.intervenhosting.net:3789/live/portutvlive.m3u8
 #EXTINF:-1 tvg-id="PromarTV.ve",PromarTV (1080p) [Not 24/7]
 http://vcp1.myplaytv.com:1935/promar/promar/playlist.m3u8
 #EXTINF:-1 tvg-id="ReformaTV.ve",Reforma TV (1080p)
 https://5bf8041cb3fed.streamlock.net/ReformaTV/ReformaTV/playlist.m3u8
-#EXTINF:-1 tvg-id="",RLV TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="RLVTV.ve",RLV TV (720p) [Not 24/7]
 https://tv.mundostreaming.cl:3083/live/radiolatinavzlalive.m3u8
 #EXTINF:-1 tvg-id="ShowVenTV.ve",ShowVen TV (1080p)
 https://vcp.myplaytv.com/coll/coll/playlist.m3u8
@@ -96,7 +96,7 @@ https://vcndistroscale.teleosmedia.com/linear/sun/sun/playlist.m3u8
 https://tv.webtuya.com:3459/live/tammeridalive.m3u8
 #EXTINF:-1 tvg-id="TeleAragua.ve",TeleAragua (480p)
 http://45.173.198.59:8080/hls/nginx3.m3u8?tla=
-#EXTINF:-1 tvg-id="",Teleboconó (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Telebocono.ve",Teleboconó (720p) [Not 24/7]
 https://rpn3.bozztv.com/ssh101/ssh101/tcbstreaming/playlist.m3u8
 #EXTINF:-1 tvg-id="Telecentro.ve",Telecentro (480p)
 https://streamtv.intervenhosting.net:3698/live/telecentrolive.m3u8
@@ -130,9 +130,9 @@ https://vcp2.myplaytv.com/tvfanb/tvfanb/playlist.m3u8
 https://ls.tves.gob.ve/hls/tves.m3u8
 #EXTINF:-1 tvg-id="TVS.ve",TVS (720p)
 https://vcp3.myplaytv.com/tvs/tvs/playlist.m3u8
-#EXTINF:-1 tvg-id="",Unare TV (392p)
+#EXTINF:-1 tvg-id="UnareTV.ve",Unare TV (392p)
 https://srv.panelcast.net/yohancarlos/yohancarlos/playlist.m3u8
-#EXTINF:-1 tvg-id="",UniTV (720p)
+#EXTINF:-1 tvg-id="UniTV.ve",UniTV (720p)
 https://vcp6.myplaytv.com/unitv/unitv/playlist.m3u8
 #EXTINF:-1 tvg-id="ValeTV.ve",Vale TV (480p) [Not 24/7]
 https://cloud.fastchannel.es/manifiest/hls/valetv/valetv_480p.m3u8
@@ -154,9 +154,9 @@ https://cloud.fastchannel.es/manifiest/hls/prog9/vepacotv.m3u8
 #EXTINF:-1 tvg-id="Vive.ve",Vive (1080p) [Not 24/7]
 #EXTVLCOPT:http-referrer=https://odysee.com/
 https://cloud.odysee.live/content/fed20cff907550b0c7d83991fb3630e2a9f90454/master.m3u8
-#EXTINF:-1 tvg-id="",VIVOplay (576p)
+#EXTINF:-1 tvg-id="VIVOplay.ve",VIVOplay (576p)
 https://linear-260.frequency.stream/mt/studio/260/hls/master/playlist.m3u8
 #EXTINF:-1 tvg-id="VPItv.ve",VPItv (1080p)
 https://ott3.streann.com/loadbalancer/services/public/channels/5d23d5882cdce61dae029fd8/playlist.m3u8
-#EXTINF:-1 tvg-id="",YATVO (720p)
+#EXTINF:-1 tvg-id="YATVO.ve",YATVO (720p)
 https://rpn3.bozztv.com/ssh101/ssh101/yatvo/playlist.m3u8
diff --git a/streams/vn.m3u b/streams/vn.m3u
index 672b6244b..d9cfa2148 100644
--- a/streams/vn.m3u
+++ b/streams/vn.m3u
@@ -113,7 +113,7 @@ https://zjizeoupprliv.vcdn.cloud/live/smil:vnews.smil/playlist.m3u8
 http://vinhphuctv.vn:8090/vinhphuclive/web.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="TTXVN.vn",VNews (TTXVN) (1080p)
 https://zjizeoupprliv.vcdn.cloud/live/vnews/chunklist.m3u8
-#EXTINF:-1 tvg-id="",VOV TV (1080p)
+#EXTINF:-1 tvg-id="VOVTV.vn",VOV TV (1080p)
 https://live.mediatech.vn/live/285fbc845578c6641d5a4c40534a0d1864b/playlist.m3u8
 #EXTINF:-1 tvg-id="VTC1.vn",VTC1 (1080p)
 https://1117141481.vnns.net/VTC1/chunks.m3u8
diff --git a/streams/ws.m3u b/streams/ws.m3u
index 6432b282d..5708d88af 100644
--- a/streams/ws.m3u
+++ b/streams/ws.m3u
@@ -1,5 +1,5 @@
 #EXTM3U
-#EXTINF:-1 tvg-id="",TV1 Samoa (720p)
+#EXTINF:-1 tvg-id="TV1Samoa.ws",TV1 Samoa (720p)
 https://anystrument.com:5443/LiveApp/streams/DfywyaY3DcWf1709948634332.m3u8
-#EXTINF:-1 tvg-id="",TV3 (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="TV3.ws",TV3 (720p) [Not 24/7]
 https://customer-ezarl905qqr949qs.cloudflarestream.com/856e914abd09e036ce9ce4fa649278b2/manifest/video.m3u8
diff --git a/streams/ye.m3u b/streams/ye.m3u
index 365910f3e..a3775973d 100644
--- a/streams/ye.m3u
+++ b/streams/ye.m3u
@@ -9,7 +9,7 @@ https://live.cdnbridge.tv/Almasirah/Almasirah_all/playlist.m3u8
 https://live2.cdnbridge.tv/AlmasirahMubasher/Mubasher_All/playlist.m3u8
 #EXTINF:-1 tvg-id="Alghadye.ye",Alghad Almushreq (576p)
 http://82.212.74.3:8000/live/7512.m3u8
-#EXTINF:-1 tvg-id="",Almahriah TV (1080p)
+#EXTINF:-1 tvg-id="AlmahriahTV.tr",Almahriah TV (1080p)
 https://master.starmena-cloud.com/hls/almahriah.m3u8
 #EXTINF:-1 tvg-id="SuhailTV.ye",Suhail TV (576p)
 http://82.212.74.98:8000/live/hls/7726.m3u8
@@ -17,5 +17,5 @@ http://82.212.74.98:8000/live/hls/7726.m3u8
 https://master.starmena-cloud.com/hls/yemenshabab.m3u8
 #EXTINF:-1 tvg-id="YemenTodayTV.ye",Yemen Today TV (480p)
 https://video.yementdy.tv/hls/yementoday.m3u8
-#EXTINF:-1 tvg-id="",Yemenia TV (720p)
+#EXTINF:-1 tvg-id="YemeniaTV.ye",Yemenia TV (720p)
 https://ffs3.gulfsat.com/YEMENIA/video.m3u8
diff --git a/streams/za_freevisiontv.m3u b/streams/za_freevisiontv.m3u
index aa38a3a71..093592f7a 100644
--- a/streams/za_freevisiontv.m3u
+++ b/streams/za_freevisiontv.m3u
@@ -3,11 +3,11 @@
 https://cdn.freevisiontv.co.za/sttv/smil:1kzn.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="CapeTownTV.za",Cape Town TV (576p)
 https://cdn.freevisiontv.co.za/sttv/smil:ctv.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",Faith TV (576p)
+#EXTINF:-1 tvg-id="FaithTV.za",Faith TV (576p)
 https://cdn.freevisiontv.co.za/sttv/smil:faith.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="SowetoTV.za",Soweto TV (576p)
 https://cdn.freevisiontv.co.za/sttv/smil:soweto.stream.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TshwaneTV.za",Tshwane TV (576p)
 https://cdn.freevisiontv.co.za/sttv/smil:tshwane.stream.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="",TV BRICS Africa (1080p)
+#EXTINF:-1 tvg-id="TVBRICSAfrica.za",TV BRICS Africa (1080p)
 https://cdn.freevisiontv.co.za/sttv/smil:brics.stream.smil/playlist.m3u8