diff --git a/streams/gr.m3u b/streams/gr.m3u
index a7b9b121e0..02edf0aab1 100644
--- a/streams/gr.m3u
+++ b/streams/gr.m3u
@@ -133,7 +133,7 @@ http://176.9.123.140:1935/mesogeiostv/stream/master.m3u8
 https://vod.streams.ovh:3037/stream/play.m3u8
 #EXTINF:-1 tvg-id="MGRTV.gr" status="online",MGR TV (1080p) [Not 24/7]
 https://vod.streams.ovh:3876/stream/play.m3u8
-#EXTINF:-1 tvg-id="MTV.gr" status="timeout",M.TV
+#EXTINF:-1 tvg-id="" status="timeout",M.TV
 http://78.83.87.222:9999/play/a015/index.m3u8
 #EXTINF:-1 tvg-id="MyRadioTV.gr" status="error",My Radio TV (360p)
 https://vdo.alphaserver.gr:3305/stream/play.m3u8
diff --git a/streams/us.m3u b/streams/us.m3u
index 03eaee1796..1e8b0df834 100644
--- a/streams/us.m3u
+++ b/streams/us.m3u
@@ -320,7 +320,7 @@ https://broadcast.mytvtogo.net/classictv4u/classictv4u/playlist.m3u8
 https://cloudflare.tv/hls/live.m3u8
 #EXTINF:-1 tvg-id="CNBC.us" status="blocked",CNBC (1080p)
 https://16live00.akamaized.net/CNBC/index.m3u8
-#EXTINF:-1 tvg-id="CNBCEurope.us" 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",CNBC Europe (480p)
+#EXTINF:-1 tvg-id="CNBCEurope.uk" 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",CNBC Europe (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/s65/index.m3u8
 #EXTINF:-1 tvg-id="CNBCIndonesia.id" status="online",CNBC Indonesia (720p)
@@ -833,7 +833,7 @@ https://a.jsrdn.com/broadcast/e9b4093a41/+0000/c.m3u8
 https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/playlist.m3u8
 #EXTINF:-1 tvg-id="MSNBC.us" status="error",MSNBC (1080p) [Not 24/7]
 http://s1.mysportz.tv:2082/msnbc/playlist.m3u8
-#EXTINF:-1 tvg-id="MTV.us" status="timeout",MTV Latinoamérica (1080p)
+#EXTINF:-1 tvg-id="" status="timeout",MTV Latinoamérica (1080p)
 http://209.91.213.10:8088/play/a01a
 #EXTINF:-1 tvg-id="Mythos.us" status="error",Mythos (720p) [Not 24/7]
 https://rpn1.bozztv.com/36bay2/gusa-mythos/playlist.m3u8
diff --git a/streams/us_localbtv.m3u b/streams/us_localbtv.m3u
index 6e374e7d95..2ed6ddbb69 100644
--- a/streams/us_localbtv.m3u
+++ b/streams/us_localbtv.m3u
@@ -266,10 +266,10 @@ https://v-ny.theus6tv.tk/hls/31.4/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",WPXN-DT7 (Newsy)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://v-ny.theus6tv.tk/hls/31.7/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",WMBQ-LD (FNX) (432p)
+#EXTINF:-1 tvg-id="WMBQCD1.us" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",WMBQ-LD (FNX) (432p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://v-ny.theus6tv.tk/hls/46.1/playlist.m3u8
-#EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",WRNN-DT2 (Circle) (432p)
+#EXTINF:-1 tvg-id="WRNNDT2.us" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",WRNN-DT2 (Circle) (432p)
 #EXTVLCOPT:http-user-agent=Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36
 https://v-ny.theus6tv.tk/hls/48.2/playlist.m3u8
 #EXTINF:-1 tvg-id="" status="online" user-agent="Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36",WPHY-CD2 (SonLife) (432p)