diff --git a/streams/kz.m3u b/streams/kz.m3u
index 96ba6850ca..2b773510cd 100644
--- a/streams/kz.m3u
+++ b/streams/kz.m3u
@@ -40,4 +40,10 @@ https://sc.id-tv.kz/Almaty.m3u8
 #EXTINF:-1 tvg-id="AlmatyTV.kz" status="blocked",Алматы (720p) [Not 24/7]
 http://live-almatytv.cdnvideo.ru/almatytv/almatytv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="AstanaTV.kz" status="timeout",Астана (576p) [Not 24/7]
-https://sc.id-tv.kz/Astana.m3u8
\ No newline at end of file
+https://sc.id-tv.kz/Astana.m3u8
+#EXTINF:-1 tvg-id="" status="timeout",Viasat History Kazakhstan (720p)
+https://sc.id-tv.kz/ViasatHistory.m3u8
+#EXTINF:-1 tvg-id="" status="timeout",Viasat Nature Kazakhstan (720p)
+https://sc.id-tv.kz/ViasatNature.m3u8
+#EXTINF:-1 tvg-id="" status="timeout",Viasat TV1000 Kazakhstan (720p)
+https://sc.id-tv.kz/TV1000.m3u8
\ No newline at end of file
diff --git a/streams/mx.m3u b/streams/mx.m3u
index a35e9b5a1d..fe2dfbc7d4 100644
--- a/streams/mx.m3u
+++ b/streams/mx.m3u
@@ -161,7 +161,7 @@ https://60ed5b6d0df78.streamlock.net:1936/canal28/canal28/playlist.m3u8
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.dailymotion.com/heraldodemexico
 #EXTINF:-1 tvg-id="" status="online",Alcarria TV (576p) [Not 24/7]
 http://217.182.77.27/live/alcarriatv-livestream.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Canal 22 (XEIMT-TDT) [Geo-blocked]
+#EXTINF:-1 tvg-id="XEIMTTDT2.mx" status="blocked",Canal 22 (XEIMT-TDT) [Geo-blocked]
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://conceptoweb-studio.com/radio/video/canal22/
 #EXTINF:-1 tvg-id="" status="online",Canal del Congreso 45.2
 https://edge.canaldelcongreso.gob.mx/live_sd2/smil:canal-sd2.smil/playlist.m3u8
diff --git a/streams/nl.m3u b/streams/nl.m3u
index 3a8f4dfb36..aa4a08f027 100644
--- a/streams/nl.m3u
+++ b/streams/nl.m3u
@@ -167,7 +167,7 @@ https://web.omroepgelderland.nl/live/livetv.m3u8
 https://www.a1mediagroep.nl/hls/a1tv.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",Radio NL (1080p) [Not 24/7]
 https://61ae39677a1ab.streamlock.net/radionl/radionl_1080p/playlist.m3u8?ref=Hoofdwebsite&token_endtime=1661322499&token_hash=yPCofcNBmbfuVCU4UqsLrQ6GgnKJGC5gQ0tn5_F9FSE=&token_starttime=0
-#EXTINF:-1 tvg-id="" status="error",RTV Arnhem (480p)
+#EXTINF:-1 tvg-id="RTVArnhemTV.nl" status="error",RTV Arnhem (480p)
 https://ms2.mx-cd.net/tv/163-669433/RTV_Arnhem.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Zed TV
-http://190.2.148.141:8080/bar7657/index.m3u8
+http://190.2.148.141:8080/bar7657/index.m3u8
\ No newline at end of file
diff --git a/streams/nl_samsung.m3u b/streams/nl_samsung.m3u
index ee69543254..43ff0427a8 100644
--- a/streams/nl_samsung.m3u
+++ b/streams/nl_samsung.m3u
@@ -15,7 +15,7 @@ https://rakuten-euronews-1-nl.samsung.wurl.tv/playlist.m3u8
 https://failarmy-international-nl.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Fashion TV
 https://fashiontv-fashiontv-5-nl.samsung.wurl.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Filmstream
+#EXTINF:-1 tvg-id="Filmstream.nl" status="online",Filmstream
 https://spi-filmstream-1-nl.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Go USA TV
 https://brandusa-gousa-1-nl.samsung.wurl.tv/playlist.m3u8
diff --git a/streams/no.m3u b/streams/no.m3u
index 365446eeec..fab8f6b6de 100644
--- a/streams/no.m3u
+++ b/streams/no.m3u
@@ -11,13 +11,7 @@ http://cdn-kanal10.crossnet.net:1935/kanal10/kanal10asia/playlist.m3u8
 https://bbe19a83414b545d91f32f94316aab71-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal2_1/playlist.m3u8?dvr=
 #EXTINF:-1 tvg-id="StortingetN202.no" status="timeout",Stortinget N-202 (576p) [Not 24/7]
 https://98d91ca32ff6fbca255f6ec9f29fc4d0-httpcache0-19333-cachelive0.dna.ip-only.net/19333-cachelive0/smil:push-sal3_1/playlist.m3u8?dvr=
-#EXTINF:-1 tvg-id="" status="online",TV2 Nyhetsstrømmen (720p)
+#EXTINF:-1 tvg-id="TV2Nyhetsstrommen.no" status="online",TV2 Nyhetsstrømmen (720p)
 https://ws15-hls-live.akamaized.net/out/u/1153546.m3u8
 #EXTINF:-1 tvg-id="" status="online",TV 2 Sporten (720p)
-https://ws31-hls-live.akamaized.net/out/u/1416253.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Viasat History Kazakhstan (720p)
-https://sc.id-tv.kz/ViasatHistory.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Viasat Nature Kazakhstan (720p)
-https://sc.id-tv.kz/ViasatNature.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Viasat TV1000 Kazakhstan (720p)
-https://sc.id-tv.kz/TV1000.m3u8
+https://ws31-hls-live.akamaized.net/out/u/1416253.m3u8
\ No newline at end of file
diff --git a/streams/nz_samsung.m3u b/streams/nz_samsung.m3u
index a5830ce4bf..adb02f2f2c 100644
--- a/streams/nz_samsung.m3u
+++ b/streams/nz_samsung.m3u
@@ -94,4 +94,4 @@ https://travelxp-travelxp-1-nz.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",True Crime Now
 https://alliantcontent-truecrimenow-3-nz.samsung.wurl.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Wonder
-https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-wondernz-samsungnz/playlist.m3u8
+https://cdn-apse1-prod.tsv2.amagi.tv/linear/amg00426-littledotstudio-wondernz-samsungnz/playlist.m3u8
\ No newline at end of file
diff --git a/streams/ph.m3u b/streams/ph.m3u
index 6b69975e38..844a823d95 100644
--- a/streams/ph.m3u
+++ b/streams/ph.m3u
@@ -25,7 +25,7 @@ https://api.new.livestream.com/accounts/19079954/events/7831871/live.m3u8
 https://abscbn-ono.akamaized.net/midroll/amagi_hls_data_abscbnAAA-abscbn-teleradyo-oando/CDN/playlist.m3u8
 #EXTINF:-1 tvg-id="TVMaria.ph" status="online",TV Maria
 http://free.fullspeed.tv/iptv-query?streaming-ip=https://www.youtube.com/c/TVMariaLIVE/live
-#EXTINF:-1 tvg-id="" status="online",CLTV 36
+#EXTINF:-1 tvg-id="CLTV36.ph" status="online",CLTV 36
 http://210.213.69.20:5080/LiveApp/streams/cltvmcr.m3u8
 #EXTINF:-1 tvg-id="" status="online",Super Radyo DZBB (720p) [Not 24/7]
 http://stream.gmanews.tv/ioslive/livestream/chunklist.m3u8?wowzasessionid=693701106
diff --git a/streams/pl.m3u b/streams/pl.m3u
index d89d33ddc2..451c826fd6 100644
--- a/streams/pl.m3u
+++ b/streams/pl.m3u
@@ -59,7 +59,7 @@ http://217.173.176.107:1935/live/tvk.stream/playlist.m3u8
 https://rd.insyscd.net/trwamtv.live/cl01/out/u/trwam.mpd
 #EXTINF:-1 tvg-id="TVTZgorzelec.pl" status="online",TVT Zgorzelec (576p) [Not 24/7]
 http://gargoyle.tomkow.pl/hls/tvt.m3u8
-#EXTINF:-1 tvg-id="" status="online",4FUN TV (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="4FunTV.pl" status="online",4FUN TV (576p) [Not 24/7]
 https://stream.4fun.tv:8888/hls/4f.m3u8
 #EXTINF:-1 tvg-id="" status="online",Radio Czworka (1080p)
 https://stream14.polskieradio.pl/pr4_video/video_pr4.stream/playlist.m3u8
diff --git a/streams/pr.m3u b/streams/pr.m3u
index c6d356252a..1ff83f185c 100644
--- a/streams/pr.m3u
+++ b/streams/pr.m3u
@@ -1,7 +1,7 @@
 #EXTM3U
 #EXTINF:-1 tvg-id="PuraPalabra.pr" status="online",Pura Palabra (718p) [Not 24/7]
 https://59825a54e4454.streamlock.net:8443/william233/william233/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",CDM International (480p) [Not 24/7]
+#EXTINF:-1 tvg-id="CDMInternacional.pr" status="online",CDM International (480p) [Not 24/7]
 https://59825a54e4454.streamlock.net:8443/marcos536/marcos536/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",CDM TV (480p) [Not 24/7]
 http://205.164.56.130:1935/marcos536/marcos536/playlist.m3u8
@@ -9,7 +9,7 @@ http://205.164.56.130:1935/marcos536/marcos536/playlist.m3u8
 https://584097344c1f0.streamlock.net/48/smil:48.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Mas TV (1080p)
 https://video1.getstreamhosting.com:1936/8212/8212/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Noti Uno Puerto Rico (854p) [Not 24/7]
+#EXTINF:-1 tvg-id="NotiUnoTV.pr" status="online",Noti Uno Puerto Rico (854p) [Not 24/7]
 https://59514edd5dd8e.streamlock.net/unoradio/unoradio1/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Wipr
 https://streannliveprtv.cachefly.net/prtv1/prtv1/playlist.m3u8
diff --git a/streams/pt.m3u b/streams/pt.m3u
index ebfde8397b..b05844c091 100644
--- a/streams/pt.m3u
+++ b/streams/pt.m3u
@@ -92,5 +92,5 @@ https://w2.manasat.com/eglise-online/smil:eglise-online.smil/playlist.m3u8
 https://w2.manasat.com/tvmana-mz/smil:tvmana-mz.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="TVManaSpanish.pt" status="online",TV Maná Español (1080p)
 https://w1.manasat.com/tvmana-espanol/smil:tvmana-espanol.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",TV MANA (RU) (486p)
+#EXTINF:-1 tvg-id="TVManaRusskiy.pt" status="timeout",TV MANA (RU) (486p)
 http://c2.manasat.com:1935/tserkov-online/russo3/playlist.m3u8
diff --git a/streams/ro.m3u b/streams/ro.m3u
index 8c44403c6c..c1905c2de2 100644
--- a/streams/ro.m3u
+++ b/streams/ro.m3u
@@ -60,7 +60,7 @@ http://89.38.8.130:39419
 https://netstreaming.eu:8080/hls/hd365.m3u8
 #EXTINF:-1 tvg-id="" status="online",MEDIA REGIONAL (576p)
 http://83.103.150.198:8080
-#EXTINF:-1 tvg-id="" status="online",Profit.ro (404p)
+#EXTINF:-1 tvg-id="ProfitTV.ro" status="online",Profit.ro (404p)
 https://stream1.1616.ro:1945/profit/livestream/playlist.m3u8?wowzatokenhash=hOdIznDoakApEuQ8FaFI3yrJuBMZHqCB7B3cWTmRWsc=
-#EXTINF:-1 tvg-id="" status="online",Profit.ro (404p) [Not 24/7]
+#EXTINF:-1 tvg-id="ProfitTV.ro" status="online",Profit.ro (404p) [Not 24/7]
 https://stream1.profit.ro:1945/profit/livestream/playlist.m3u8
diff --git a/streams/ru.m3u b/streams/ru.m3u
index cc32169c99..dd0bac7e52 100644
--- a/streams/ru.m3u
+++ b/streams/ru.m3u
@@ -560,21 +560,21 @@ http://sochinskayatrk.ru/hdtv/hls/43Channel_hd/playlist.m3u8
 http://stream.backustv.ru/live/btv/index.m3u8
 #EXTINF:-1 tvg-id="" status="error",Backus TV Страшное (720p) [Not 24/7]
 http://stream.backustv.ru/live/btv2/index.m3u8
-#EXTINF:-1 tvg-id="" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Bridge TV (480p)
+#EXTINF:-1 tvg-id="BRIDGE.ru" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Bridge TV (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s34/index.m3u8
-#EXTINF:-1 tvg-id="" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Bridge TV (480p)
+#EXTINF:-1 tvg-id="BRIDGE.ru" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Bridge TV (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s78/index.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",HD life (1080p) [Not 24/7]
 http://37.193.6.155:34040/udp/239.1.9.2:1234
 #EXTINF:-1 tvg-id="" status="error",Millenium TV (1080p)
 http://tv1.mmg.ooo/live/hd.stream/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",MOSOBR.TV (720p)
+#EXTINF:-1 tvg-id="MosObrTV.ru" status="timeout",MOSOBR.TV (720p)
 http://retj.educom.ru/mosobrtv/tv1/index.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",MOSOBR.TV (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="MosObrTV.ru" status="timeout",MOSOBR.TV (720p) [Not 24/7]
 http://retc.educom.ru/mosobrtv/tv1/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",RT Documentary (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="RTDoc.ru" status="online",RT Documentary (1080p) [Geo-blocked]
 https://rt-rtd.rttv.com/live/rtdoc/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",RT News (1080p)
 https://rumble-foxo.cdn.rumble.cloud/live/hr6yv36f/slot-30/ngrp:srak-wx8r_all/playlist.m3u8
@@ -584,23 +584,23 @@ https://strm.yandex.ru/kal/rt_hd/rt_hd0.m3u8
 https://rt-glb.rttv.com/live/rtnews/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",TRK 555 (720p)
 http://trk555.tv:8888/live
-#EXTINF:-1 tvg-id="" status="blocked",Авто 24 (576p) [Geo-blocked]
+#EXTINF:-1 tvg-id="AVTO24.ru" status="blocked",Авто 24 (576p) [Geo-blocked]
 http://185.52.77.67:8080/Avto24/tracks-v1a1/mono.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Архыз 24 (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Arkhyz24.ru" status="blocked",Архыз 24 (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/arhyz24/arhyz240.m3u8
-#EXTINF:-1 tvg-id="" status="online",Архыз 24 (1080p)
+#EXTINF:-1 tvg-id="Arkhyz24.ru" status="online",Архыз 24 (1080p)
 https://live.mediacdn.ru/sr1/arhis24/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",БСТ (Башкирское спутниковое телевидение) (576p)
+#EXTINF:-1 tvg-id="BST.ru" status="online",БСТ (Башкирское спутниковое телевидение) (576p)
 https://bsttv.bonus-tv.ru/cdn/bst/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Губерния (Самара) (576p)
+#EXTINF:-1 tvg-id="GuberniaSamara.ru" status="online",Губерния (Самара) (576p)
 http://live.guberniatv.cdnvideo.ru/guberniatv/guberniatv.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",Дайвинг.TV (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/diving/diving0.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Диалоги о рыбалке (1080p)
+#EXTINF:-1 tvg-id="Dialoguesaboutfishing.ru" status="blocked",Диалоги о рыбалке (1080p)
 http://strm.yandex.ru/kal/dialogi/dialogi0.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",Дождь (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/tvrain/tvrain0.m3u8
-#EXTINF:-1 tvg-id="" status="online",Доктор (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Doctor.ru" status="online",Доктор (720p) [Not 24/7]
 http://88b9da48.kazmazpaz.ru/iptv/D7M94NBVB5DLFS/512/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Евразия (Орск) (720p)
 http://infochhdcdn.trkeurasia.ru/orsk-infochhd/infochhd/playlist.m3u8
@@ -612,51 +612,51 @@ http://serv25.vintera.tv:8081/test/k16/playlist.m3u8
 https://strm.yandex.ru/kal/kinoclassic/kinoclassic0.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Крым 24 (540p) [Not 24/7]
 http://mr2live.1tvcrimea.ru:8080/24tvcrimea.m3u8
-#EXTINF:-1 tvg-id="" status="online",Курай (576p)
+#EXTINF:-1 tvg-id="KurajTV.ru" status="online",Курай (576p)
 https://bsttv.bonus-tv.ru/cdn/kurai/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",КФУ ТВ (1080p) [Not 24/7]
 https://cdn.universmotri.ru/live/kfu.sdp/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Луч (Пуровск) (720p) [Not 24/7]
 https://live.trk-luch.ru/hls/live.m3u8
-#EXTINF:-1 tvg-id="" status="online",Между.Net (Междуреченск) (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="Mezhdunet.ru" status="online",Между.Net (Междуреченск) (720p) [Not 24/7]
 http://212.77.128.179:8089/www_mezhdunet/mezhdunet/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Мир Белагорья (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="MirBelogorya.ru"" status="timeout",Мир Белагорья (720p) [Geo-blocked]
 http://mirbelogorya.ru:8080/mirbelogorya/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Мир Белогорья (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="MirBelogorya.ru" status="online",Мир Белогорья (720p) [Geo-blocked]
 http://live-mirbelogorya.cdnvideo.ru/mirbelogorya/mirbelogorya1.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Мир Белогорья (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="MirBelogorya.ru" status="online",Мир Белогорья (720p) [Geo-blocked]
 http://stream.tvbelgorod.ru:8080/mirbelogorya/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Наше Крутое HD (1080p) [Not 24/7]
 http://ba5729d5.krasnafhg.ru/iptv/EAEWFFWBXPVVLY/915/index.m3u8
-#EXTINF:-1 tvg-id="" status="online",Новый мир (406p) [Not 24/7]
+#EXTINF:-1 tvg-id="NovyyMir.ru" status="online",Новый мир (406p) [Not 24/7]
 http://stream.studio360.tv/nw/nw_576p/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",НТВ Стиль (480p)
+#EXTINF:-1 tvg-id="NTVStyle.ru" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",НТВ Стиль (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s77/index.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",О2ТВ (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="o2tv.ru" status="blocked",О2ТВ (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/o2/o20.m3u8
 #EXTINF:-1 tvg-id="" status="online",Оплот 2 (1080p)
 http://ott.inmart.tv:8081/17/index.m3u8
-#EXTINF:-1 tvg-id="" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Охотник и Рыболов (480p)
+#EXTINF:-1 tvg-id="Ohotnikirybolov.ru" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Охотник и Рыболов (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s62/index.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Охотник и рыболов International (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="OhotnikirybolovInt.ru" status="blocked",Охотник и рыболов International (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/ohotnik/ohotnik0.m3u8
 #EXTINF:-1 tvg-id="" status="online",Первый канал Евразия (396p) [Not 24/7]
 http://stream.euroasia.lfstrm.tv/perviy_evrasia/1/index.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Первый канал Евразия (576p) [Not 24/7]
 https://sc.id-tv.kz/1KanalEvraziya.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",Первый крымский (540p) [Not 24/7]
+#EXTINF:-1 tvg-id="PerviyKrymskiy.ru" status="timeout",Первый крымский (540p) [Not 24/7]
 http://mrlive.1tvcrimea.ru:8080/1tvcrimea.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Продвижение (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Prodvizhenie.ru" status="blocked",Продвижение (1080p) [Geo-blocked]
 https://strm.yandex.ru/kal/prodvizheniye/prodvizheniye0.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",Пятница! (540p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Friday.ru" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",Пятница! (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178
 https://zabava-htlive.cdn.ngenix.net/hls/CH_PYATNIZZA/variant.m3u8
-#EXTINF:-1 tvg-id="" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Пятница! International (480p)
+#EXTINF:-1 tvg-id="FridayInternational.ru" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Пятница! International (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s50/index.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",Пятый Канал (540p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Channel5.ru" status="online" user-agent="Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178",Пятый Канал (540p) [Geo-blocked]
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.84 Safari/537.36 CrKey/1.21a.76178
 https://zabava-htlive.cdn.ngenix.net/hls/CH_5TV/variant.m3u8
 #EXTINF:-1 tvg-id="" status="blocked",Радио 10 (1024p) [Not 24/7]
@@ -667,15 +667,15 @@ http://video.govoritmoskva.ru:8080/live/rufmbk-1/index.m3u8
 https://video.govoritmoskva.ru/rufm/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Радио Пилот (720p) [Not 24/7]
 https://pilotfm.ru/cam/hls/pilothd.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",РЕН ТВ International (576p) [Not 24/7]
+#EXTINF:-1 tvg-id="RENTV.ru" status="timeout",РЕН ТВ International (576p) [Not 24/7]
 https://sc.id-tv.kz/RenTV.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",Россия РТР
 https://a3569455801-s26881.cdn.ngenix.net/live/smil:rtrp.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Русский Экстрим
+#EXTINF:-1 tvg-id="RussianExtreme.ru" status="online",Русский Экстрим
 http://vid.extremtv.ru/hls_get/cameraFeed.m3u8
-#EXTINF:-1 tvg-id="" status="online",Страна FM (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="StranaFM.ru" status="online",Страна FM (720p) [Not 24/7]
 http://live.stranafm.cdnvideo.ru/stranafm/stranafm_hd.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",СТРК (720p) [Not 24/7]
+#EXTINF:-1 tvg-id="STRKHD.ru" status="online",СТРК (720p) [Not 24/7]
 http://sochinskayatrk.ru/hdtv/hls/strc_hd/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="error" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",СТС (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
@@ -688,33 +688,33 @@ https://zabava-htlive.cdn.ngenix.net/hls/CH_STS/variant.m3u8
 https://zabava-htlive.cdn.ngenix.net/hls/CH_STSLOVE/variant.m3u8
 #EXTINF:-1 tvg-id="" status="timeout",СТС (576p) [Not 24/7]
 https://sc.id-tv.kz/STS.m3u8
-#EXTINF:-1 tvg-id="" status="online",Такт/Рен ТВ (Курск) (294p) [Not 24/7]
+#EXTINF:-1 tvg-id="Takt24.ru" status="online",Такт/Рен ТВ (Курск) (294p) [Not 24/7]
 http://109.194.62.29:8080
 #EXTINF:-1 tvg-id="" status="online",ТВ Кварц (576p) [Not 24/7]
 https://video.quartztelecom.ru:18080/hls/2386168/71fe656b993c510f39a5/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",ТВ Экстра (720p)
+#EXTINF:-1 tvg-id="TVExtra.ru" status="online",ТВ Экстра (720p)
 http://live-1.otcnet.ru/tvextra720b/index.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",ТВТУР (720p) [Geo-blocked]
+#EXTINF:-1 tvg-id="TVTURTV.ru" status="blocked",ТВТУР (720p) [Geo-blocked]
 https://strm.yandex.ru/kal/tvtour/tvtour0.m3u8
-#EXTINF:-1 tvg-id="" status="timeout",ТВЦ (Международный) (576p)
+#EXTINF:-1 tvg-id="TVCentrInternational.ru" status="timeout",ТВЦ (Международный) (576p)
 http://ad-hls-tvc.cdnvideo.ru/tvc-p222/smil:tvc.smil/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Телеканал 86 (Сургут) (1080p) [Not 24/7]
 https://sitv.ru/hls/s86.m3u8
-#EXTINF:-1 tvg-id="" status="online",Телплюс ТВ (Астрахань) (360p) [Not 24/7]
+#EXTINF:-1 tvg-id="Telplus.ru" status="online",Телплюс ТВ (Астрахань) (360p) [Not 24/7]
 http://streaming.astrakhan.ru/telplushd/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",ТНВ-Планета (576p)
+#EXTINF:-1 tvg-id="TNVPlanet.ru" status="online",ТНВ-Планета (576p)
 http://tnv.bonus-tv.ru/cdn/tnvplanet/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Футбол (480p)
+#EXTINF:-1 tvg-id="Football.ru" status="timeout" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Футбол (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s41/index.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Центральное телевидение (ЦТВ) (480p)
+#EXTINF:-1 tvg-id="CentralTV.ru" status="online" user-agent="Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",Центральное телевидение (ЦТВ) (480p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (iPhone; CPU iPhone OS 12_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
 http://ott-cdn.ucom.am/s20/index.m3u8
 #EXTINF:-1 tvg-id="" status="online",Эхо TV (Рязань) (576p) [Not 24/7]
 https://live-echotv.cdnvideo.ru/echotv/echotv.sdp/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online",Ювелирочка ТВ (576p)
+#EXTINF:-1 tvg-id="Yuvelirochka.ru" status="online",Ювелирочка ТВ (576p)
 http://live-uvelirochka.cdnvideo.ru/uvelirochka/uvelirochka_720p3/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online",Югра (576p)
 http://live.ugratv.cdnvideo.ru/ugratv/smil:ugrastream1.smil/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",ЯМАЛ 1
-https://bl.rutube.ru/livestream/eff3ed0c2cdde88e8c5fdc515aee2c9f/index.m3u8?e=1653312522&s=rAfTRV43vtwOtE12zJ8UQQ&scheme=https
+#EXTINF:-1 tvg-id="Yamal.ru" status="blocked",ЯМАЛ 1
+https://bl.rutube.ru/livestream/eff3ed0c2cdde88e8c5fdc515aee2c9f/index.m3u8?e=1653312522&s=rAfTRV43vtwOtE12zJ8UQQ&scheme=https
\ No newline at end of file
diff --git a/streams/ru_okkotv.m3u b/streams/ru_okkotv.m3u
index 951da3f326..f93536acba 100644
--- a/streams/ru_okkotv.m3u
+++ b/streams/ru_okkotv.m3u
@@ -75,17 +75,17 @@ https://okkotv-live.cdnvideo.ru/channel/VIP_Premiere_HD.m3u8
 https://okkotv-live.cdnvideo.ru/channel/VIP_Serial_HD.m3u8
 #EXTINF:-1 tvg-id="Zvezda.ru" status="blocked",Звезда (480p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/Zvezda_SD.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",5 канал (480p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Channel5.ru" status="blocked",5 канал (480p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/5_OTT.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Дикая охота (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="DikayaOkhotaHD.ru" status="blocked",Дикая охота (1080p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/Dikaya_Ohota_HD.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Дикая рыбалка (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="DikayaRybalkaHD.ru" status="blocked",Дикая рыбалка (1080p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/Dikaya_Rybalka_HD.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Дикий (480p) [Geo-blocked]
+#EXTINF:-1 tvg-id="Dikij.ru" status="blocked",Дикий (480p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/Dikiy.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",Калейдскоп (480p) [Geo-blocked]
+#EXTINF:-1 tvg-id="KaleidoscopeTV.ru" status="blocked",Калейдскоп (480p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/Kaleidoskop.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",СТС (1080p) [Geo-blocked]
+#EXTINF:-1 tvg-id="CTC.ru" status="blocked",СТС (1080p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/CTC_HD_OTT.m3u8
-#EXTINF:-1 tvg-id="" status="blocked",СТС Love (480p) [Geo-blocked]
+#EXTINF:-1 tvg-id="CTCLove.ru" status="blocked",СТС Love (480p) [Geo-blocked]
 https://okkotv-live.cdnvideo.ru/channel/CTC_Love_OTT_2.m3u8