diff --git a/data/channels.csv b/data/channels.csv
index 7e11ff2e..2a36945f 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -2270,8 +2270,6 @@ BeritaSatuEnglish.id,BeritaSatu English,,,,ID,,,c/ID,eng,news,FALSE,,,,https://w
 BeritaSatuWorld.id,BeritaSatu World,,,B Universe,ID,,,r/INT,ind;eng,news,FALSE,,,,https://www.beritasatu.com/livestream/world,https://i.imgur.com/gHBxpyc.png
 BerkahShopTV.id,Berkah Shop TV,,,,ID,,,c/ID,ind,shop,FALSE,,,,https://berkahshopping.com/,https://i.imgur.com/IsSw1rO.png
 BerksCommunityTV.us,Berks Community TV,BCTV,,,US,US-PA,Reading,s/US-PA,eng,general,FALSE,,,,https://www.bctv.org/,https://i.imgur.com/vQ6a4VL.png
-UMGATV.us,UMGA-TV,,,,US,US-PA,King of Prussia,s/US-PA,eng,legislative,FALSE,,,,https://www.umtownship.org/departments/public-information/umga-tv/,https://i.imgur.com/yWrbd5d.png
-NeshaminySchoolDistrctTV.us,Neshaminy School Distrct TV,,,,US,US-PA,Langhorne,s/US-PA,eng,education,FALSE,,,,https://www.neshaminy.org/domain/2070,https://i.imgur.com/lZiTWwF.png
 BernamaTV.my,Bernama TV,,,,MY,,,c/MY,msa,,FALSE,,,,https://www.bernama.com/,https://i.imgur.com/skJjF4m.png
 BeSeries.be,Be Series,Be Séries,,,BE,,,c/BE,fra,series,FALSE,,,,,https://upload.wikimedia.org/wikipedia/fr/thumb/b/bc/Be_S%C3%A9ries_logo.png/512px-Be_S%C3%A9ries_logo.png
 BesiktasWebTV.tr,Besiktas Web TV,,,,TR,,,c/TR,tur,,FALSE,,,,,https://i.ibb.co/bRhnM6W/qti5aea.png
@@ -3532,6 +3530,7 @@ CCNTV6.tt,CCN TV 6,,,,TT,,,c/TT,spa,,FALSE,,,,https://www.tv6tnt.com/,https://i.
 CCPlutoTVGermany.de,CC Pluto TV Germany,,,,DE,,,c/DE,deu,comedy,FALSE,,,,https://pluto.tv/en/live-tv/cc-pluto-tv-de,https://i.imgur.com/MjC40At.png
 CCPSEducationChannel.us,CCPS Education Channel,,,,US,US-FL,Naples,s/US-FL,eng,education,FALSE,,,,https://www.collierschools.com/Page/1246,https://i.imgur.com/62S7dI8.png
 CCPSTV.us,CCPS-TV,,,,US,US-MD,La Plata,s/US-MD,eng,education,FALSE,,,,http://cablecast.ccboe.com/CablecastPublicSite/watch/1?channel=1,https://i.imgur.com/98ffKYK.png
+CCPTV.us,CCPTV,,,,US,US-PA,Philadelphia,s/US-PA,eng,general,FALSE,,,,https://ccp.edu/about-us/college-tv-station/ccptv-live-stream,https://i.imgur.com/8LrjrV3.png
 CCTN47.ph,CCTN 47,,,,PH,,,c/PH,tgl,,FALSE,2002-12-17,,,http://cctn47.com/,https://i.imgur.com/IFpAmvW.png
 CCTV.us,CC-TV,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/feFWTb8.jpg
 CCTV1.cn,CCTV-1,CCTV-1 综合,,China Central Television,CN,,,c/CN,zho,general,FALSE,1978-05-01,,,http://tv.cctv.com/cctv1/,https://i.imgur.com/ChfbGqR.png
@@ -16205,6 +16204,7 @@ Neox.es,Neox,,,,ES,,,c/ES,spa,,FALSE,,,,http://www.antena3.com/neox/,https://i.i
 NeoxTV.ar,Neox TV,,,,AR,AR-A,Salta,s/AR-A,spa,,FALSE,,,,https://sonicaargentina.com.ar/,https://i.imgur.com/eIX71c9.png
 NepaChannel.np,Nepa Channel,,,,NP,,,c/NP,nep,,FALSE,,,,,https://i.imgur.com/LgCjKXZ.png
 Nepal1.in,Nepal 1,,,ENCPL;T-Series,IN,,,c/IN,nep,,FALSE,2004-01-01,,,http://www.nepal1tv.net/,https://i.imgur.com/Pgg8dQ2.png
+NeshaminySchoolDistrctTV.us,Neshaminy School Distrct TV,,,,US,US-PA,Langhorne,s/US-PA,eng,education,FALSE,,,,https://www.neshaminy.org/domain/2070,https://i.imgur.com/lZiTWwF.png
 NesihaTV.et,Nesiha TV,,,,ET,,,c/ET,amh,,FALSE,,,,http://www.nesiha.tv/,https://i.imgur.com/rqEyzjE.png
 NESN.us,NESN,,,Fenway Sports Group;Delaware North,US,,,c/US,eng,sports,FALSE,1984-04-04,,,http://nesn.com/,https://i.imgur.com/Lv1bUG5.png
 NESNPlus.us,NESN Plus,,,,US,,,c/US,eng,,FALSE,,,,http://nesn.com/,https://i.imgur.com/j74nFmh.png
@@ -17617,6 +17617,7 @@ PeTV.si,PeTV,,,,SI,,,c/SI,slv,,FALSE,,,,,https://i.imgur.com/2YU65qY.png
 PFC.br,PFC,,,,BR,,,c/BR,por,,FALSE,,,,http://pfc.globo.com/,https://i.imgur.com/zgxPcrc.png
 PFCInternacional.br,PFC Internacional,,,,BR,,,c/BR,por,,FALSE,,,,http://pfci.globo.com/,https://i.imgur.com/VniZc15.png
 PGATour.us,PGA Tour,,,,US,,,c/US,eng,sports,FALSE,,,,https://pluto.tv/en/live-tv/pga-tour,https://i.imgur.com/J0TY9dG.png
+PhillyCAM.us,PhillyCAM,Philadelphia Community Access Media,,,US,US-PA,Philadelphia,s/US-PA,eng,general,FALSE,,,,https://phillycam.org/,https://i.imgur.com/ENOr31n.png
 Phoenix.de,Phoenix,,,,DE,,,c/DE,deu,,FALSE,,,,https://www.phoenix.de/,https://i.imgur.com/T1532t9.png
 PhoenixChineseChannel.hk,Phoenix Chinese Channel,鳳凰衛視中文台,,Phoenix Television,HK,,,c/HK,zho,general,FALSE,1996-03-31,,,http://phtv.ifeng.com/,https://i.imgur.com/rwY7FHT.png
 PhoenixCNEChannel.hk,Phoenix CNE Channel,鳳凰衛視歐洲台,,Phoenix Television,HK,,,c/HK,eng;zho,general,FALSE,1998-08-21,,,http://www.pcne.tv/,https://i.imgur.com/tYr9IVZ.png
@@ -22990,8 +22991,6 @@ TurkmenOwazy.tm,Turkmen Owazy,Türkmen Owazy,,,TM,,,c/TM,tuk,,FALSE,,,,http://tu
 TurmadaMonicaBrazil.br,Turma da Monica Brazil,Turma da Mônica Brazil,,,BR,,,c/BR,por,kids,FALSE,,,,https://pluto.tv/en/live-tv/turma-da-monica,https://i.imgur.com/nrvPPrW.png
 Tuti.af,Tuti,,,,AF,,,c/AF,pus,,FALSE,,,,,https://i.imgur.com/JerfIBt.jpg
 TUTV.us,TUTV,Temple University TV,,,US,US-PA,Philadelphia,s/US-PA,eng,education,FALSE,,,,https://templetv.net/watch-live/,https://i.imgur.com/At0BPeA.png
-PhillyCAM.us,PhillyCAM,Philadelphia Community Access Media,,,US,US-PA,Philadelphia,s/US-PA,eng,general,FALSE,,,,https://phillycam.org/,https://i.imgur.com/ENOr31n.png
-CCPTV.us,CCPTV,,,,US,US-PA,Philadelphia,s/US-PA,eng,general,FALSE,,,,https://ccp.edu/about-us/college-tv-station/ccptv-live-stream,https://i.imgur.com/8LrjrV3.png
 TuyaLaJandaTelevision.es,Tuya La Janda Television,Tuya La Janda Televisión,,,ES,ES-AN,,s/ES-AN,spa,,FALSE,,,,https://tuyatv.com/,https://i.imgur.com/KjWuini.png
 TuyenQuangTV.vn,Tuyen Quang TV,,,,VN,,,c/VN,vie,,FALSE,,,,https://tuyenquangtv.vn/,https://i.imgur.com/OkAstWv.png
 TV.br,TV!,,,,BR,,,c/BR,por,,FALSE,1999-05-10,1999-10-12,RedeTV.br,,https://i.imgur.com/bSz7T5j.png
@@ -24294,6 +24293,7 @@ UlziiTV.mn,Ulzii TV,,,,MN,,,c/MN,mon,,FALSE,,,,,https://i.imgur.com/p7tsUTI.png
 UMAGTV.cl,UMAGTV,,,,CL,,Punta Arenas,c/CL,spa,,FALSE,,,,https://www.umagtv.cl/blank-1,https://i.imgur.com/biXepTU.png
 UMAGTV2.cl,UMAGTV2,,,,CL,,Punta Arenas,c/CL,spa,,FALSE,,,,https://www.umagtv.cl/blank-2,https://i.imgur.com/ZWWAnsP.png
 UmbriaTV.it,Umbria TV,,,,IT,,,c/IT,ita,,FALSE,,,,https://www.umbriatv.com/,https://i.imgur.com/olJIJ7c.png
+UMGATV.us,UMGA-TV,,,,US,US-PA,King of Prussia,s/US-PA,eng,legislative,FALSE,,,,https://www.umtownship.org/departments/public-information/umga-tv/,https://i.imgur.com/yWrbd5d.png
 UmmTV.th,Umm TV,,,,TH,,,c/TH,tha,,FALSE,,,,https://ummtv.com/,https://i.imgur.com/5AV0JpL.png
 UMTV.mx,UMTV,,,,MX,MX-NLE,,s/MX-NLE,spa,,FALSE,,,,http://umtv.mx/,https://i.imgur.com/sjxVdPh.png
 UNABTV.co,UNAB TV,,,,CO,CO-SAN,Bucaramanga,c/CO,spa,,FALSE,,,,https://unabtv.com/en-vivo/,https://i.imgur.com/204Sgbu.png