diff --git a/data/channels.csv b/data/channels.csv
index c1e89a97..d4bc2da5 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -995,6 +995,7 @@ AmericasValueChannel.us,America's Value Channel,,,,US,,,c/US,eng,,FALSE,,,,https
 AmericasVoice.us,America's Voice,,,,US,,,c/US,eng,news,FALSE,,,,,https://i.imgur.com/jtFBBGs.jpg
 AmericasVoiceNews.us,America's Voice News,,,,US,,,c/US,eng,news,FALSE,,,,https://pluto.tv/en/live-tv/americas-voice,https://images.pluto.tv/channels/5e1f7da4bc7d740009831259/colorLogoPNG.png
 AmericaTelevision.pe,America Television,América Televisión,,Plural TV,PE,PE-LIM,Lima,c/PE,spa,general,FALSE,1958-12-15,,,https://www.americatv.com.pe/,https://upload.wikimedia.org/wikipedia/commons/thumb/4/4c/Am%C3%A9rica_Televisi%C3%B3n.svg/512px-Am%C3%A9rica_Televisi%C3%B3n.svg.png
+AmericaTeVe.pr,America TeVe,América TeVé,América CV Network,,PR,,San Juan,c/PR,spa,general;entertainment,FALSE,,,,https://www.americatevepr.com/,https://i.imgur.com/K9o3mLP.png
 AmericaTucuman.ar,America Tucuman,América Tucumán,,,AR,AR-T,,c/AR,spa,news,FALSE,2017-01-01,,,https://americatucuman.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/6/6a/Am%C3%A9rica_Tucum%C3%A1n_Canal_28.1_%282019-1%29.png/512px-Am%C3%A9rica_Tucum%C3%A1n_Canal_28.1_%282019-1%29.png
 AmericaTV.ar,America TV,América TV,,,AR,,,c/AR,spa,general,FALSE,,,,https://www.americatv.com.ar/,https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Am%C3%A9rica_TV_%28Nuevo_logo_Junio_2020%29.png/512px-Am%C3%A9rica_TV_%28Nuevo_logo_Junio_2020%29.png
 AmericavsAddiction.us,America vs. Addiction,,,,US,,,c/US,eng,,FALSE,,,,,https://3gz8cg829c.execute-api.us-west-2.amazonaws.com/prod/image-renderer/16x9/full/600/center/90/a0e4b00e-239d-484d-9d86-2ba28295ad94-large16x9_STIRR_0721_EPG_AmericaVsAddiction_1920x1080.png
@@ -1195,14 +1196,6 @@ ApostolTV.hu,Apostol TV,,,,HU,,,c/HU,hun,,FALSE,,,,http://apostoltv.hu/,https://
 ApostrofTV.ua,Apostrof TV,Апостроф TV,,,UA,,,c/UA;c/RU,ukr,,FALSE,,,,https://apostrophe.ua/tv,https://i.imgur.com/VHhBs5d.png
 AppleTV.gh,Apple TV,,,,GH,,,c/GH,eng,,FALSE,,,,,https://www.lyngsat.com/logo/tv/aa/apple-tv-gh.png
 AppleValleyChannel180.us,Apple Valley Channel 180,,,,US,US-MN,Apple Valley,s/US-MN,eng,legislative,FALSE,,,,https://www.ci.apple-valley.mn.us/491/Meeting-Webstream,https://i.imgur.com/V62gcm6.png
-ISD191.us,ISD 191,,,,US,US-MN,Burnsville,s/US-MN,eng,education,FALSE,,,,https://burnsvillemn.gov/484/Burnsville-Community-Media,https://i.imgur.com/fAtCkHF.png
-QCTV.us,QCTV,,,,US,US-MN,Champlin,s/US-MN,eng,general,FALSE,,,,http://qctv.org/live/,https://i.imgur.com/4eLPDOQ.png
-QCTVPlus.us,QCTV+,,,,US,US-MN,Champlin,s/US-MN,eng,general,FALSE,,,,http://qctv.org/qctv-plus/,https://i.imgur.com/Th6F8WK.png
-QCTVAndover.us,QCTV Andover,,,,US,US-MN,Andover,s/US-MN,eng,general,FALSE,,,,http://qctv.org/andover/,https://i.imgur.com/BFDuGFx.png
-ColumbiaHeightsChannel16.us,Columbia Heights Channel 16,,,,US,US-MN,Columbia Heights,s/US-MN,eng,legislative,FALSE,,,,https://www.columbiaheightsmn.gov/government/channel_16_streaming.php,https://i.imgur.com/bxXOEsL.png
-ETVCommunityEvents.us,E-TV Community Events,,,,US,US-MN,Eagan,s/US-MN,eng,general,FALSE,,,,https://vod-eagan.cablecast.tv/CablecastPublicSite/watch/7?channel=7,https://i.imgur.com/I1G27J4.png
-ETVGovernment.us,E-TV Government,,,,US,US-MN,Eagan,s/US-MN,eng,legislative,FALSE,,,,https://vod-eagan.cablecast.tv/CablecastPublicSite/?channel=4,https://i.imgur.com/RIKhFXZ.png
-ETVPublicAccess.us,E-TV Public Access,,,,US,US-MN,Eagan,s/US-MN,eng,general,FALSE,,,,https://vod-eagan.cablecast.tv/CablecastPublicSite/?channel=3,https://i.imgur.com/eRx8Uz7.png
 Aprendeencasa32.mx,Aprende en casa 3.2,,,,MX,,,c/MX,spa,,FALSE,,,,https://aprendeencasa.sep.gob.mx/,https://www.lyngsat.com/logo/tv/aa/aprende-en-casa-mx.png
 AprendeTV.mx,Aprende TV,,,,MX,,,c/MX,spa,,FALSE,,,,https://aprende.gob.mx/,https://i.imgur.com/6tSoRE1.png
 ApsaraTV.kh,Apsara TV,,,,KH,,,c/KH,fra,,FALSE,,2020-01-01,ApsaraTV11.kh,,https://i.imgur.com/da6tCFP.png
@@ -4618,6 +4611,7 @@ ColorVision.do,Color Vision,Color Visión,,Bermúdez family,DO,,,c/DO,spa,,FALSE
 ColosalTV.cr,Colosal TV,,,,CR,,,c/CR,spa,entertainment,FALSE,,,,https://colosalstereo.com/,https://i.imgur.com/4kxxSCq.png
 ColourfulStage.cn,Colourful Stage,,,,CN,,,c/CN,zho,,FALSE,,,,,https://www.lyngsat.com/logo/tv/cc/colourful_stage_cn.png
 Colours.ph,Colours,,,,PH,,,c/PH,eng,,FALSE,,,,,https://i.imgur.com/C7nRhIo.png
+ColumbiaHeightsChannel16.us,Columbia Heights Channel 16,,,,US,US-MN,Columbia Heights,s/US-MN,eng,legislative,FALSE,,,,https://www.columbiaheightsmn.gov/government/channel_16_streaming.php,https://i.imgur.com/bxXOEsL.png
 ColumnaTV.ro,Columna TV,,,,RO,,,c/RO,ron,,FALSE,,,,,https://i.imgur.com/Tyrzwr2.png
 ComarcaTV.ar,Comarca TV,,,,AR,AR-B,Marinez,s/AR-B,spa,,FALSE,,,,https://comarcasi.com.ar/,https://yt3.ggpht.com/ytc/AKedOLQ4omXGgPfRXZn1xvIZI9536HN2JR_VoDmZ-K1_yw=s500-c-k-c0x00ffffff-no-rj
 Combate.br,Combate,,,,BR,,,c/BR,por,,FALSE,,,,http://combate.globo.com/,https://i.imgur.com/fY3H0aE.png
@@ -6262,8 +6256,10 @@ ETVBalyaBharatAssamese.in,ETV Balya Bharat Assamese,,,,IN,,,c/IN,asm;eng,,FALSE,
 ETVBalyaBharatBangla.in,ETV Balya Bharat Bangla,,,,IN,,,c/IN,ben;eng,,FALSE,,,,,https://i.imgur.com/ntuH9CD.png
 ETVBalyaBharatOdia.in,ETV Balya Bharat Odia,,,,IN,,,c/IN,ori;eng,,FALSE,,,,,https://i.imgur.com/fvOxfIA.png
 ETVCinema.in,ETV Cinema,,,,IN,,,c/IN,tel,movies,FALSE,,,,http://www.etv.co.in/channels/home?channelId=8,https://i.imgur.com/8eWPjsW.png
+ETVCommunityEvents.us,E-TV Community Events,,,,US,US-MN,Eagan,s/US-MN,eng,general,FALSE,,,,https://vod-eagan.cablecast.tv/CablecastPublicSite/watch/7?channel=7,https://i.imgur.com/I1G27J4.png
 ETVEntertainment.et,ETV Entertainment,ኢቲቪ መዝናኛ,,,ET,,,c/ET,amh,entertainment,FALSE,,,,http://www.ebc.et/,https://i.imgur.com/oQTPp2j.png
 etvGhana.gh,e.tv Ghana,,,,GH,,,c/GH,afr,,FALSE,,,,https://www.etvghana.com/,https://i.imgur.com/Egadcif.png
+ETVGovernment.us,E-TV Government,,,,US,US-MN,Eagan,s/US-MN,eng,legislative,FALSE,,,,https://vod-eagan.cablecast.tv/CablecastPublicSite/?channel=4,https://i.imgur.com/RIKhFXZ.png
 ETVLanguages.et,ETV Languages,የኢቲቪ ቋንቋዎች,,,ET,,,c/ET,amh,news,FALSE,,,,http://www.ebc.et/,https://i.imgur.com/syiQde2.png
 ETVLife.in,ETV Life,,,,IN,,,c/IN,tel,,FALSE,,,,http://www.etv.co.in/channels/home?channelId=7,https://i.imgur.com/RFfpcoY.png
 ETVManisa.tr,ETV Manisa,,,,TR,,,c/TR,tur,,FALSE,,,,,https://i.ibb.co/QKXtdkz/sOd3INg.png
@@ -6271,6 +6267,7 @@ ETVNews.et,ETV News,ኢቲቪ ዜና,,,ET,,,c/ET,amh,news,FALSE,,,,http://www.eb
 etvNewsSport.za,e.tv News & Sport,,,,ZA,,,c/ZA,afr,news,FALSE,,,,https://www.openview.co.za/channel/open-news,https://i.imgur.com/QVXwd1u.png
 ETVPlus.ee,ETV+,,,,EE,,,c/EE,rus;est,,FALSE,,,,http://etvpluss.err.ee/,https://upload.wikimedia.org/wikipedia/commons/a/a2/ETV%2B_logo.png
 ETVPlus.in,ETV Plus,,,,IN,,,c/IN,tel,,FALSE,,,,http://www.etv.co.in/channels/home?channelId=5,https://i.imgur.com/GYGOWI2.png
+ETVPublicAccess.us,E-TV Public Access,,,,US,US-MN,Eagan,s/US-MN,eng,general,FALSE,,,,https://vod-eagan.cablecast.tv/CablecastPublicSite/?channel=3,https://i.imgur.com/eRx8Uz7.png
 ETVRwanda.rw,ETV Rwanda,,,,RW,,,c/RW,eng,,FALSE,,,,,https://i.imgur.com/EzMJpyy.png
 ETVTelangana.in,ETV Telangana,,,,IN,,,c/IN,tel,news,FALSE,,,,http://www.etv.co.in/channels/home?channelId=2,https://i.imgur.com/lQBs2Cs.jpg
 ETVTelugu.in,ETV Telugu,,,,IN,,,c/IN,tel,,FALSE,,,,http://www.etv.co.in/channels/home?channelId=1,https://upload.wikimedia.org/wikipedia/en/0/07/ETV_old_logo.png
@@ -8437,6 +8434,7 @@ IsangoTV.rw,Isango TV,,,,RW,,,c/RW,kin,,FALSE,,,,http://www.isangostar.rw/,https
 ISatBrazil.br,I.Sat Brazil,I.Sat Brasil,,,BR,,,c/BR,por,,FALSE,,,,http://www.isat.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/2/20/I.Sat_logo.svg/512px-I.Sat_logo.svg.png
 ISatPanregional.us,I.Sat Panregional,,,,US,,,c/MX;r/LATAM;r/CARIB,spa,,FALSE,,,,http://www.isat.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/2/20/I.Sat_logo.svg/512px-I.Sat_logo.svg.png
 ISatSouth.us,I.Sat South,,,,US,,,c/AR;c/PY;c/UY,spa,,FALSE,,,,http://www.isat.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/2/20/I.Sat_logo.svg/512px-I.Sat_logo.svg.png
+ISD191.us,ISD 191,,,,US,US-MN,Burnsville,s/US-MN,eng,education,FALSE,,,,https://burnsvillemn.gov/484/Burnsville-Community-Media,https://i.imgur.com/fAtCkHF.png
 IsfahanTV.ir,Isfahan TV,,,,IR,,,c/IR,fas,,FALSE,,,,http://isfahan.irib.ir/tv,https://www.lyngsat.com/logo/tv/ii/isfahan_tv_ir.png
 IsharaTV.in,Ishara TV,,,IN10 Media,IN,,,c/IN,hin,,FALSE,,,,,https://i.imgur.com/LwAOeMS.png
 IshtarTV.iq,Ishtar TV,,,,IQ,,,c/IQ,ara,general,FALSE,,,,,https://i.imgur.com/CXRX1D6.png
@@ -18341,6 +18339,9 @@ Qazaqstan.kz,Qazaqstan,,,,KZ,,,c/KZ,kaz,,FALSE,,,,https://qazaqstan.tv/,https://
 QazaqTV.kz,Qazaq TV,,,,KZ,,,c/KZ,kaz;rus;kir;uzb;eng,,FALSE,,,,https://qazaqtv.com/,https://i.imgur.com/k5iuvE7.png
 QazSport.kz,QazSport,,,,KZ,,,c/KZ,kaz,sports,FALSE,,,,https://qazsporttv.kz/,https://i.imgur.com/UDJ0P5Q.png
 QazvinTV.ir,Qazvin TV,,,,IR,,,c/IR,fas,,FALSE,,,,http://qazvin.irib.ir/tv,https://www.lyngsat.com/logo/tv/qq/qazvin_tv.png
+QCTV.us,QCTV,,,,US,US-MN,Champlin,s/US-MN,eng,general,FALSE,,,,http://qctv.org/live/,https://i.imgur.com/4eLPDOQ.png
+QCTVAndover.us,QCTV Andover,,,,US,US-MN,Andover,s/US-MN,eng,general,FALSE,,,,http://qctv.org/andover/,https://i.imgur.com/BFDuGFx.png
+QCTVPlus.us,QCTV+,,,,US,US-MN,Champlin,s/US-MN,eng,general,FALSE,,,,http://qctv.org/qctv-plus/,https://i.imgur.com/Th6F8WK.png
 QebeleTV.az,Qebele TV,,,,AZ,,,c/AZ,aze,general,FALSE,,,,,https://i.imgur.com/degUDMf.png
 QelloConcertsbyStingray.ca,Qello Concerts by Stingray,,,Stingray Group Inc.,CA,,,c/CA,eng,music,FALSE,,,,https://qello.com/en/,https://i.imgur.com/IRyFTWq.png
 QhuboTV.hn,Q'hubo TV,,,,HN,,,c/HN,spa,,FALSE,,,,https://qhubotv.com/,https://www.lyngsat.com/logo/tv/qq/qhubo-tv-hn.png
@@ -19529,6 +19530,7 @@ SaltoBrasaMusic.nl,Salto Brasa Music,,,,NL,,,c/NL,nld,music,FALSE,,,,,https://i.
 SaltPlusLightTelevision.ca,Salt + Light Television,,,Salt and Light Catholic Media Foundation,CA,,,c/CA,eng,religious,FALSE,2003-07-01,,,https://saltandlighttv.org/,https://upload.wikimedia.org/wikipedia/en/e/eb/Salt_%2B_Light_Television_2020.png
 SaltTV.ug,Salt TV,,,,UG,,,c/UG,eng,religious,FALSE,,,,https://www.saltmedia.ug/,https://i.imgur.com/Ux5nS7C.png
 SaludTV.mx,Salud TV,,,,MX,,,c/MX,spa,,FALSE,,,,,https://www.lyngsat.com/logo/tv/ss/salud-tv-mx.png
+SalvacionTV.pr,Salvacion TV,Salvación TV,,,PR,,San Juan,c/PR,spa,religious,FALSE,,,,http://www.salvaciontv.org/,https://i.imgur.com/6HOViG9.png
 SalvationTV.ng,Salvation TV,,,,NG,,,c/NG,eng,,FALSE,,,,https://www.salvationtv.tv/,https://www.lyngsat.com/logo/tv/ss/salvation_tv_ng.png
 SalveTV.de,Salve TV,,,,DE,,,c/DE,deu,,FALSE,,,,http://www.salve.tv/,https://www.salve.tv/web/templates/img/logo_salve_tv.png
 Salyam.ru,Salyam,Салям,,,RU,,,c/RU,rus,,FALSE,,,,https://bash.news/salyam,https://i.imgur.com/vPvULj7.png
@@ -27746,8 +27748,6 @@ WorldTV.mx,World TV,,,,MX,,,c/MX,spa,,FALSE,,,,https://worldtv.mx/,https://www.l
 WorldTV.tw,World TV,,,,TW,,,c/TW,zho,,FALSE,,,,https://www.wtvtw.com/,https://www.lyngsat.com/logo/tv/ww/world_tv_tw.png
 WorldWildMuzzik.rs,World Wild Muzzik,,,,RS,,,c/RS,srp,music,FALSE,,,,,https://mts.rs/oec/images/tv_channels/f3c8ef34cbc21105e87abaa5550e913d.jpg
 WORODT1.us,WORO-DT1,Teleoro Canal 13,TeleOro Canal 13,,US,US-PR,Carolina,s/US-PR,spa,,FALSE,,,,https://www.canal13pr.tv/,https://i.imgur.com/uhQPWqp.png
-SalvacionTV.pr,Salvacion TV,Salvación TV,,,PR,,San Juan,c/PR,spa,religious,FALSE,,,,http://www.salvaciontv.org/,https://i.imgur.com/6HOViG9.png
-AmericaTeVe.pr,America TeVe,América TeVé,América CV Network,,PR,,San Juan,c/PR,spa,general;entertainment,FALSE,,,,https://www.americatevepr.com/,https://i.imgur.com/K9o3mLP.png
 WorTV.fi,WorTV,WörTV,,,FI,FI-12,Vöyri,s/FI-12,swe,,FALSE,,,,http://www.wortv.fi/,https://i.imgur.com/P9O1jo0.png
 WOS.nl,WOS,,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/UtOWySG.jpg
 WOSCCD1.us,WOSC-CD1,,HSN,,US,US-PA,Pittsburgh,s/US-PA,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/c/cb/HSN_logo.svg/512px-HSN_logo.svg.png