diff --git a/channels/us.m3u b/channels/us.m3u
index 668d08e9e6..34d574dd7d 100644
--- a/channels/us.m3u
+++ b/channels/us.m3u
@@ -49,7 +49,7 @@ https://cdnapisec.kaltura.com/p/2630451/sp/2630451/playManifest/entryId/1_61e7x3
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/knsd-dt1.m3u8
 #EXTINF:-1 tvg-id="WHDH.us" tvg-name="7News Boston (WHDH)" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/b/b5/WHDH_7_logo.png" group-title="Local",7News Boston (WHDH) (540p)
 https://bcsecurelivehls-i.akamaihd.net/hls/live/598046/4744899807001_1/livestream/master.m3u8
-#EXTINF:-1 tvg-id="9PBS.us" tvg-name="9 PBS" tvg-country="US" tvg-language="English" tvg-logo="https://imgur.com/rMdJ5DP.png" group-title="",9 PBS [Geo-blocked]
+#EXTINF:-1 tvg-id="9PBS.us" tvg-name="9 PBS" tvg-country="US" tvg-language="English" tvg-logo="https://imgur.com/rMdJ5DP.png" group-title="General",9 PBS [Geo-blocked]
 https://ketcdt.lls.cdn.pbs.org/ketcdt/0436e066-85c7-408b-a4fd-5b492ccb5fd8/primary.m3u8
 #EXTINF:-1 tvg-id="AEBestof.us" tvg-name="A&E (Best of)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/zl7Gzwm.png" group-title="Entertainment",A&E (Best of) (1080p)
 https://bk7l2w4nlx53-hls-live.5centscdn.com/AETV/514c04b31b5f01cf00dd4965e197fdda.sdp/playlist.m3u8
@@ -2084,9 +2084,9 @@ https://d3nzocdfkx2ybv.cloudfront.net/in/cmg-kokitv-hls-v3/live.m3u8
 https://content.uplynk.com/2c88dfe19e1447e6a6aa27e8e143a140.m3u8
 #EXTINF:-1 tvg-id="KoolTVHD.us" tvg-name="Kool TV HD" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/aILvazd.jpg" group-title="Local",Kool TV HD
 http://209.182.219.50:1935/roku/roku/playlist.m3u8
-#EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="Local",KPBS-DT1
+#EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="General",KPBS-DT1
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/kpbs-dt1.m3u8
-#EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT2" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="Local",KPBS-DT2
+#EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT2" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="General",KPBS-DT2
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/kpbs-dt2.m3u8
 #EXTINF:-1 tvg-id="KPBS.us" tvg-name="KPBS-DT4" tvg-country="US" tvg-language="English" tvg-logo="https://upload.wikimedia.org/wikipedia/en/5/5b/New_KPBS_logo_2019_%282%29.png" group-title="Kids",KPBS-DT4
 https://streams.the6tv.duckdns.org:2443/locals/SanDiego/kpbs-dt4.m3u8
@@ -2556,7 +2556,7 @@ https://moviesphereuk-samsunguk.amagi.tv/playlist.m3u8
 https://moviesphere-samsung-samsungus.amagi.tv/playlist.m3u8
 #EXTINF:-1 tvg-id="MoviesphereUK.us" tvg-name="Moviesphere UK" tvg-country="US" tvg-language="English" tvg-logo="https://od.lk/s/MF8yMjM1Njg1NTFf/MovieSphere_400x400.png" group-title="Movies",Moviesphere UK
 https://moviesphereuk-rakuten.amagi.tv/playlist.m3u8
-#EXTINF:-1 tvg-id="MPT.us" tvg-name="MPT" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/kt0R7ua.jpg" group-title="",MPT PBS
+#EXTINF:-1 tvg-id="MPT.us" tvg-name="MPT" tvg-country="US" tvg-language="" tvg-logo="https://i.imgur.com/kt0R7ua.jpg" group-title="General",MPT PBS
 https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/chunklist_b600000.m3u8
 #EXTINF:-1 tvg-id="MSNBC.us" tvg-name="MSNBC" tvg-country="US" tvg-language="English" tvg-logo="https://static-s.aa-cdn.net/img/ios/396885309/4ad7161a83db264f3ba4b62ef1ab662a?v=1" group-title="News",MSNBC
 http://1111296894.rsc.cdn77.org/LS-ATL-54548-10/playlist.m3u8
@@ -3099,7 +3099,7 @@ https://kdindt.lls.cdn.pbs.org/kdindt/4b65e70a-e262-4290-ae67-45bd0814cafd/prima
 https://wjctdt.lls.cdn.pbs.org/wjctdt/5eee712c-8713-4283-8af1-c0ba9d25d6fd/primary.m3u8
 #EXTINF:-1 tvg-id="WKLE.us" tvg-name="WKLE-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wkle-color-single-brand-logo-yJUbW1W.png" group-title="General",PBS Kentucky (WKGB) (WKLE) [Geo-blocked]
 https://wkledt.lls.cdn.pbs.org/wkledt/61059d95-3011-4270-b9d1-17b88ca25b13/primary.m3u8
-#EXTINF:-1 tvg-id="PBSKET.us" tvg-name="PBS KET" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ocMGZM6.png" group-title="Local",PBS KET (720p)
+#EXTINF:-1 tvg-id="PBSKET.us" tvg-name="PBS KET" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/ocMGZM6.png" group-title="General",PBS KET (720p)
 https://2-fss-1.streamhoster.com/pl_134/amlst:200914-1282960/chunklist.m3u8
 #EXTINF:-1 tvg-id="PBSKidsEST.us" tvg-name="PBS Kids (EST)" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/hkZntiL.png" group-title="Kids",PBS Kids (EST) (720p)
 https://2-fss-2.streamhoster.com/pl_140/amlst:200914-1298290/playlist.m3u8
@@ -3127,7 +3127,7 @@ https://wnetdt.lls.cdn.pbs.org/wnetdt/80f93f7f-9742-47b8-aa58-0c0ceb866d9f/prima
 https://wsredt.lls.cdn.pbs.org/wsredt/fc47f495-57b9-4aea-bb6b-d2ce52b74ea1/primary.m3u8
 #EXTINF:-1 tvg-id="WTVP.us" tvg-name="WTVP-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/wtvp-color-cobranded-logo-977FFXE.png" group-title="General",PBS Peoria (WTVP) [Geo-blocked]
 https://wtvpdt.lls.cdn.pbs.org/wtvpdt/41427091-bd65-483d-bdb5-9a4159a5d93e/primary.m3u8
-#EXTINF:-1 tvg-id="PBSPhiladelphiaWHYYDT1.us" tvg-name="PBS Philadelphia (WHYY-DT1)" tvg-country="US" tvg-language="English" tvg-logo="http://mayaangeloufilm.com/wp-content/uploads/2015/12/PBS_logo_128.png" group-title="Local",PBS Philadelphia (WHYY-DT1) [Geo-blocked]
+#EXTINF:-1 tvg-id="PBSPhiladelphiaWHYYDT1.us" tvg-name="PBS Philadelphia (WHYY-DT1)" tvg-country="US" tvg-language="English" tvg-logo="http://mayaangeloufilm.com/wp-content/uploads/2015/12/PBS_logo_128.png" group-title="General",PBS Philadelphia (WHYY-DT1) [Geo-blocked]
 https://whyydt.lls.cdn.pbs.org/whyydt/6e441aa1-51ab-4ecd-a1dc-bc99da43c3ed/primary.m3u8
 #EXTINF:-1 tvg-id="KAET.us" tvg-name="KAET-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/kaet-color-single-brand-logo-Bz3Oe7u.png" group-title="General",PBS Phoenix (KAET) [Geo-blocked]
 https://kaetdt.lls.cdn.pbs.org/kaetdt/6d08b852-2c19-4eb7-9348-a5e15b685357/primary.m3u8
@@ -3159,7 +3159,7 @@ https://wpbsdt.lls.cdn.pbs.org/wpbsdt/c17cb584-9efe-46fc-ac91-3fb453714069/prima
 https://wxeldt.lls.cdn.pbs.org/wxeldt/6f553836-7e24-445a-8c3c-cc418aaba9dc/primary.m3u8
 #EXTINF:-1 tvg-id="KPTS.us" tvg-name="KPTS-DT1" tvg-country="US" tvg-language="English" tvg-logo="https://image.pbs.org/stations/kpts-color-cobranded-logo-THeGpUD.png" group-title="General",PBS Wichita (KPTS) [Geo-blocked]
 https://kptsdt.lls.cdn.pbs.org/kptsdt/f8cd0e67-9e8d-464d-aaf1-f7874f5f6ae6/primary.m3u8
-#EXTINF:-1 tvg-id="PBSMarylandPublicTV.us" tvg-name="PBS | Maryland Public TV" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="Local",PBS | Maryland Public TV
+#EXTINF:-1 tvg-id="PBSMarylandPublicTV.us" tvg-name="PBS | Maryland Public TV" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",PBS | Maryland Public TV
 https://2-fss-2.streamhoster.com/pl_138/amlst:201814-1291584/playlist.m3u8
 #EXTINF:-1 tvg-id="PBSWorldChannel.us" tvg-name="PBS | World Channel" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBSWorld_972x972.png?raw=true" group-title="Entertainment",PBS | World Channel
 https://cs.ebmcdn.net/eastbay-live-hs-1/apt/mp4:apt-world/playlist.m3u8
@@ -6468,7 +6468,7 @@ https://lnc-wjbk-fox-aws.tubi.video/index.m3u8
 https://content.uplynk.com/40cec2bf074c40f08932da03ab4510be.m3u8
 #EXTINF:-1 tvg-id="WLNGRadio.us" tvg-name="WLNG Radio" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/11r6tgW.png" group-title="Local",WLNG Radio
 http://wlngstudiowebcam.srfms.com:1935/wlngstudiowebcam/livestream/playlist.m3u8
-#EXTINF:-1 tvg-id="WLVT" tvg-name="WLVT PBS Allentown" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="Local",WLVT PBS Allentown
+#EXTINF:-1 tvg-id="WLVT" tvg-name="WLVT PBS Allentown" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",WLVT PBS Allentown
 https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="WMFD.us" tvg-name="WMFD" tvg-country="US" tvg-language="English" tvg-logo="https://wmfd.com/images/logo.png" group-title="Local",WMFD (720p) [Not 24/7]
 https://player-api.new.livestream.com/accounts/1194911/events/3466400/live.m3u8
@@ -6514,7 +6514,7 @@ https://wownow-wownowkids-1.vizio.wurl.com/manifest/playlist.m3u8
 http://cdn.elsalvadordigital.com:1935/wowtv/wowtv/playlist.m3u8
 #EXTINF:-1 tvg-id="WPECCBS12News.us" tvg-name="WPEC CBS12 News" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/SG7iSaA.png" group-title="Local",WPEC CBS12 News (720p)
 https://content.uplynk.com/channel/0123b306191a4307a31b9fb573213fd3.m3u8
-#EXTINF:-1 tvg-id="WPPT" tvg-name="WPPT 39 Extra Philadelphia" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="",WPPT 39 Extra Philadelphia
+#EXTINF:-1 tvg-id="WPPT" tvg-name="WPPT 39 Extra Philadelphia" tvg-country="US" tvg-language="English" tvg-logo="https://github.com/geonsey/Free2ViewTV/blob/master/images/logos/PBS.png?raw=true" group-title="General",WPPT 39 Extra Philadelphia
 https://forerunnerrtmp.livestreamingcdn.com/output18-2/output18-2.stream/playlist.m3u8
 #EXTINF:-1 tvg-id="WSJ.us" tvg-name="WSJ" tvg-country="US" tvg-language="English" tvg-logo="https://i.imgur.com/2IOP6LI.jpg" group-title="News",WSJ (1080p)
 https://wsjlivehls-lh.akamaihd.net/i/events1_1@174990/master.m3u8