diff --git a/data/channels.csv b/data/channels.csv
index cc235ec3..50f085f4 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -17,6 +17,7 @@ id,name,alt_names,network,owners,country,subdivision,city,broadcast_area,languag
 11TV.af,11 TV,,,,AF,,,c/AF,pus,,FALSE,,,,,https://i.imgur.com/0Ey0nMc.png
 123tv.de,1-2-3.tv,,,,DE,,,c/DE,deu,,FALSE,2020-01-01,,,https://www.1-2-3.tv/,https://i.imgur.com/slSUDNX.png
 123TV.ve,123TV,,,,VE,,,c/VE,spa,kids,FALSE,2019-01-01,,,https://123tvinfantil.blogspot.com/,https://i.imgur.com/xXGeZms.png
+12tv.es,12tv,,,,ES,ES-VC,Alicante,s/ES-VC,spa,general,FALSE,,,,https://www.12tv.es/,https://i.imgur.com/VSTgXsh.png
 12TVParma.it,12 TV Parma,,,,IT,,,c/IT,ita,general,FALSE,,,,https://www.12tvparma.it/,https://i.imgur.com/mBYxWOg.png
 13C.cl,13C,,,,CL,,,c/CL,spa,,FALSE,,,,https://www.13.cl/c,https://i.imgur.com/BvGsAkw.png
 13emeRue.fr,13eme Rue,13ème Rue,,Universal Networks International,FR,,,c/FR;c/BE;c/CH;c/LU;c/MC,fra,,FALSE,1997-11-13,,,https://www.13emerue.fr/,https://i.imgur.com/k0DCMTL.png
@@ -192,7 +193,6 @@ id,name,alt_names,network,owners,country,subdivision,city,broadcast_area,languag
 7SpiritsTV.et,7 Spirits TV,,,,ET,,,c/ET,amh,,FALSE,,,,,https://i.imgur.com/CmNIuqd.png
 7StarsTV.jo,7 Stars TV,,,,JO,,,c/JO,ara,,FALSE,,,,,https://www.livenewsnow.com/wp-content/uploads/2015/12/7-Stars-TV-1.png
 7TelevisionRegiondeMurcia.es,7 Television Region de Murcia,7 Televisión Región de Murcia,,,ES,ES-MC,,s/ES-MC,spa,,FALSE,2006-09-20,,,http://7tvregiondemurcia.es/,https://upload.wikimedia.org/wikipedia/commons/thumb/2/20/7TVRM.svg/512px-7TVRM.svg.png
-Canal1MarMenorTorrePacheco.es,Canal 1 Mar Menor - Torre Pacheco,,,Consorcio del Mar Menor,ES,ES-MC,,s/ES-MC,spa,general;news,FALSE,,,,https://www.tuwebtv.es/,https://i.imgur.com/MQOwCdZ.png
 7TV.hu,7.TV,,,,HU,,,c/HU,hun,,FALSE,,,,https://behir.hu/tv,https://i.imgur.com/CnUhAlK.png
 7tv.ru,7tv,,,,RU,,,c/RU,rus,entertainment,FALSE,2016-12-16,,,http://www.7-tv.tv/,https://i.imgur.com/Wuy9Vtn.png
 7TVAndalucia.es,7 TV Andalucia,7 TV Andalucía,,,ES,ES-AN,,s/ES-AN,spa,news,FALSE,,,,,https://i.imgur.com/rnzMR9R.png
@@ -211,6 +211,7 @@ Canal1MarMenorTorrePacheco.es,Canal 1 Mar Menor - Torre Pacheco,,,Consorcio del
 88Films.us,88 Films,,,,US,,,c/US,zho,movies,FALSE,,,,http://www.directv.com/international/chinese,https://i.imgur.com/CbjD0zY.png
 88Stereo.cr,88 Stereo,,,,CR,,,c/CR,spa,music,FALSE,,,,http://www.88stereo.com/,https://i.imgur.com/i3YwORV.png
 88TV.us,88 TV,,,,US,,,c/US,zho,,FALSE,,,,http://www.directv.com/international/chinese,https://i.imgur.com/tcKfZ3T.png
+8LaMarinaTV.es,8 La Marina TV,,,,ES,ES-VC,Benidorm,s/ES-VC,spa,general,FALSE,,,,https://8lamarinatv.com/,https://i.imgur.com/BTJvvBK.png
 8TV.my,8TV,八度空间,,,MY,,,c/MY,zho,,FALSE,,,,https://www.xtra.com.my/,https://i.imgur.com/Jkx9W88.png
 8TVCadiz.es,8 TV Cadiz,8 TV Cádiz,,,ES,ES-AN,Cadiz,s/ES-AN,spa,,FALSE,,,,https://www.8cadiz.es/directo/,https://i.imgur.com/WGh5ULv.png
 8TVCatalunya.es,8 TV Catalunya,,,,ES,ES-CT,,s/ES-CT,cat,,FALSE,,,,https://www.8tv.cat/en-directe.html,https://i.imgur.com/5MgRUWR.png
@@ -359,6 +360,7 @@ AcasaGold.ro,Acasa Gold,,,,RO,,,c/RO,ron,,FALSE,,,,http://www.acasagold.ro/,http
 AcasaTV.md,Acasa TV,,,,MD,,,c/MD,ron,,FALSE,,,,,https://i.imgur.com/k8qpvHb.png
 ACCDigitalNetwork.us,ACC Digital Network,ACCDN,,ESPN Inc.,US,,,c/US,eng,sports,FALSE,,,,https://theacc.com/watch/,https://i.imgur.com/V6Kaqha.png
 Access19.us,Access 19,,,,US,US-MD,Rockville,s/US-MD,eng,general,FALSE,,,,https://montgomerycommunitymediatv.org/CablecastPublicSite/watch/3?channel=1,https://i.imgur.com/7F4LJMT.png
+Access21.us,Access 21,,,,US,US-NC,Charlotte,s/US-NC,eng,education,FALSE,,,,https://videoplayer.telvue.com/player/e_NbyQXDx8XrZtlH62Ci_x0aciiwoP2Y/stream/463?fullscreen=false&showtabssearch=true&autostart=true,https://i.imgur.com/wlTEeox.png
 Access4PAC.us,Access 4 PAC,,,,US,US-IL,Springfield,s/US-IL,eng,general,FALSE,,,,https://channel18vod.springfield.il.us/CablecastPublicSite/watch/4?channel=1,https://i.imgur.com/DQu3gES.png
 AccessBet.ng,AccessBet,,,,NG,,,c/NG,eng,,FALSE,,,,https://sport.accessbet.com/,https://i.imgur.com/wdwnc1m.png
 AccessBetLeague.ng,AccessBet League,,,,NG,,,c/NG,eng,,FALSE,,,,https://sport.accessbet.com/,https://i.imgur.com/J4yq6Qi.png
@@ -2793,6 +2795,7 @@ BungaBunga.al,Bunga Bunga,,,,AL,,,c/AL,sqi,xxx,TRUE,,,,http://www.tring.al/,http
 BungoTV.id,Bungo TV,,,,ID,ID-JA,,s/ID-JA,ind,,FALSE,,,,https://www.bungotv.com/,https://i.imgur.com/OrCrtDA.png
 BunyoroTV.ug,Bunyoro TV,,,,UG,,,c/UG,eng,,FALSE,,,,,https://i.imgur.com/0YhBBzK.png
 BurkinaInfoTV.bf,Burkina Info TV,,,,BF,,,c/BF,fra,,FALSE,,,,,https://i.imgur.com/a9v5CbU.png
+BurrianaTeVe.es,BurrianaTeVe,,,,ES,ES-VC,Castellón,s/ES-VC,cat,general,FALSE,,,,https://www.burrianateve.com/,https://i.imgur.com/G3nIGHh.png
 BursaTV.tr,Bursa TV,,,,TR,,,c/TR,tur,,FALSE,,,,https://www.bursatv.com.tr/,https://i.imgur.com/9cl1MR8.png
 BusanMBCTV.kr,Busan MBC TV,부산MBC TV,,,KR,KR-26,Busan,s/KR-26,kor,,FALSE,,,,https://busanmbc.co.kr/,https://i.imgur.com/jiFOYi5.png
 Business24Africa.ci,Business 24 Africa,,,,CI,,,c/CI,fra,business,FALSE,,,,https://www.business24tv.com/,https://i.imgur.com/zZFl3vy.png
@@ -2928,6 +2931,7 @@ Canal13SanLuis.ar,Canal 13 San Luis,,,,AR,AR-D,San Luis,s/AR-D,spa,,FALSE,,,,htt
 Canal13Sinart.cr,Canal 13 Sinart,,,,CR,,,c/CR,spa,,FALSE,,,,,https://i.imgur.com/lz9ZqKh.png
 Canal13Tabasco.mx,Canal 13 Tabasco,,,,MX,,,c/MX,spa,,FALSE,,,,http://canal9tabasco.com/,https://i.imgur.com/Ovb7quY.png
 Canal16PacificoTV.ar,Canal 16 Pacifico TV,,,,AR,AR-A,Salta,s/AR-A,spa,,FALSE,,,,http://pacifico929.com.ar/,https://i.imgur.com/nn6Kl0r.png
+Canal1MarMenorTorrePacheco.es,Canal 1 Mar Menor - Torre Pacheco,,,Consorcio del Mar Menor,ES,ES-MC,,s/ES-MC,spa,general;news,FALSE,,,,https://www.tuwebtv.es/,https://i.imgur.com/MQOwCdZ.png
 Canal2.co,Canal 2,,,,CO,CO-VAC,Cali,s/CO-VAC,spa,general,FALSE,,,,https://www.canal2.co/,https://i.imgur.com/BCrsZTQ.png
 Canal2.cr,Canal 2,,,,CR,,,c/CR,spa,general,FALSE,,,,https://www.repretel.com/envivo-canal2/,https://i.imgur.com/Nn8BtH5.png
 Canal2.ni,Canal 2,,,,NI,,,c/NI,spa,,FALSE,,,,https://canal2tv.com/,https://i.imgur.com/hy0bXxo.png
@@ -2987,6 +2991,7 @@ Canal3Monde.ne,Canal 3 Monde,,,,NE,,,c/NE,fra,,FALSE,,,,,https://i.imgur.com/MWa
 Canal3Niger.ne,Canal 3 Niger,,,,NE,,,c/NE,fra,,FALSE,,,,,https://i.imgur.com/Yf35GQC.png
 Canal3Pinamar.ar,Canal 3 Pinamar,,,,AR,AR-B,Pinamar,c/AR,spa,,FALSE,,,,http://www.canal3pinamar.com/,https://i.imgur.com/IABFaH1.png
 Canal3Rosario.ar,Canal 3 Rosario,,,,AR,AR-S,Rosario,s/AR-S,spa,,FALSE,,,,https://www.rosario3.com/el-tres-en-vivo/,https://i.imgur.com/PjsKbrz.png
+Canal3TVBiar.es,Canal 3 TV Biar,,,,ES,ES-VC,Alicante,s/ES-VC,cat,general,FALSE,,,,http://canal3biar.es/,https://i.imgur.com/cnKCZkK.png
 Canal4.cr,Canal 4,,,,CR,,,c/CR,spa,,FALSE,,,,http://www.repretel.com/,https://i.imgur.com/5arZEgO.png
 Canal4.es,Canal 4,,,,ES,ES-CT,,s/ES-CT,cat;spa,,FALSE,,,,https://www.grup4.com/?page_id=14675&lang=ca,https://i.imgur.com/tQh8C3s.png
 Canal4.ni,Canal 4,,,,NI,,,c/NI,spa,,FALSE,,,,https://canal4.com.ni/,https://i.imgur.com/nhgtZdt.png
@@ -3036,6 +3041,7 @@ Canal7Chubut.ar,Canal 7 Chubut,,,,AR,AR-U,Chubut,s/AR-U,spa,,FALSE,,,,,https://w
 Canal7Jujuy.ar,Canal 7 Jujuy,,,,AR,AR-Y,Jujuy,s/AR-Y,spa,,FALSE,,,,http://www.radiovisionjujuy.com.ar/canal7dejujuy,https://i.imgur.com/K0jk8p4.png
 Canal7Punta.uy,Canal 7 Punta,,,Grupo Clarín S.A.,UY,UY-MA,Punta del Este,s/UY-MA,spa,,FALSE,1968-01-18,,,https://www.canal7.com.uy/,https://i.imgur.com/W87rlp2.png
 Canal7Salta.ar,Canal 7 Salta,,,,AR,AR-A,Salta,s/AR-A,spa,,FALSE,,,,https://canal7salta.com/,https://i.imgur.com/CudG6sl.png
+Canal7TeleValencia.es,Canal 7 TeleValencia,,,Radio Difusión Tore,ES,ES-VC,Valencia,s/ES-VC,spa;cat,general,FALSE,,,,https://7televalencia.com/,https://i.imgur.com/ILfXDRs.png
 Canal7TV.ar,Canal 7 TV,,,,AR,AR-G,Santiago del Estereo,s/AR-G,spa,,FALSE,,,,http://canal7.tv/,https://i.imgur.com/iJMH0UK.png
 Canal8.cr,Canal 8,,,,CR,,,c/CR,spa,,FALSE,,,,https://www.telediario.cr/television,https://i.imgur.com/nefPi2Y.png
 Canal8.hn,Canal 8,Congreso TV,,,HN,,Tegucigalpa,c/HN,spa,entertainment,FALSE,2008-08-20,,,https://tnh.gob.hn/,https://i.imgur.com/oTjn7bM.png
@@ -4950,7 +4956,6 @@ CumbiaTV.pe,Cumbia TV,,Cable Netword,,PE,PE-LIM,Lima,c/PE,spa,music,FALSE,,,,htt
 CupertinoCityChannel.us,Cupertino City Channel,,,,US,US-CA,Cupertino,s/US-CA,eng;spa,legislative,FALSE,,,,https://www.cupertino.org/residents/city-channel,https://i.imgur.com/p9Jn0Dy.png
 CuriosityChannel.us,Curiosity Channel,,,,US,,,c/US,eng,,FALSE,,,,https://curiositystream.com/,https://i.imgur.com/K0kZMYo.png
 CurrentTimeTV.cz,Current Time TV,Настоящее Время,,Radio Free Europe;Radio Liberty,CZ,,,c/RU;c/UA,rus,news,FALSE,2017-02-07,,,https://www.currenttime.tv/,https://i.imgur.com/eSCZ8YY.png
-Access21.us,Access 21,,,,US,US-NC,Charlotte,s/US-NC,eng,education,FALSE,,,,https://videoplayer.telvue.com/player/e_NbyQXDx8XrZtlH62Ci_x0aciiwoP2Y/stream/463?fullscreen=false&showtabssearch=true&autostart=true,https://i.imgur.com/wlTEeox.png
 CURRENTTVEducation.us,CURRENTTV-Education,,,,US,US-NC,Manteo,s/US-NC,eng,education,FALSE,,,,https://currenttv.org/watch-education-live/,https://i.imgur.com/Fv50ICy.png
 CURRENTTVGovernment.us,CURRENTTV-Government,,,,US,US-NC,Manteo,s/US-NC,eng,legislative,FALSE,,,,https://currenttv.org/watch-government-live/,https://i.imgur.com/Fv50ICy.png
 CurroJimenezSpain.es,Curro Jimenez Spain,Curro Jiménez Spain,,,ES,,,c/ES,spa,series,FALSE,,,,https://pluto.tv/en/live-tv/curro-jimenez-es,https://i.imgur.com/e3biTY5.png
@@ -22948,12 +22953,7 @@ TV47Kenya.ke,TV47 Kenya,,,Cape Media Ltd,KE,,,c/KE,eng,general,FALSE,,,,https://
 TV4Fakta.se,TV4 Fakta,,,TV4 Group,SE,,,c/SE,swe,documentary,FALSE,2005-09-15,,,http://tv4fakta.se/,https://i.imgur.com/4AmqO2V.png
 TV4Film.se,TV4 Film,,,,SE,,,c/SE,swe,movies,FALSE,2004-04-18,,,http://tv4.se/tv4film,https://i.imgur.com/d5clM91.png
 TV4Guld.se,TV4 Guld,,,,SE,,,c/SE,swe,classic,FALSE,2006-11-03,,,http://www.tv4.se/guld,https://i.imgur.com/zO3tUyT.png
-Canal3TVBiar.es,Canal 3 TV Biar,,,,ES,ES-VC,Alicante,s/ES-VC,cat,general,FALSE,,,,http://canal3biar.es/,https://i.imgur.com/cnKCZkK.png
 TV4LaVall.es,TV4 La Vall,,,,ES,ES-VC,Vall d'Uixó,c/ES,spa,,FALSE,,,,https://teve4lavall.com/,https://i.imgur.com/NqjFVHp.png
-Canal7TeleValencia.es,Canal 7 TeleValencia,,,Radio Difusión Tore,ES,ES-VC,Valencia,s/ES-VC,spa;cat,general,FALSE,,,,https://7televalencia.com/,https://i.imgur.com/ILfXDRs.png
-8LaMarinaTV.es,8 La Marina TV,,,,ES,ES-VC,Benidorm,s/ES-VC,spa,general,FALSE,,,,https://8lamarinatv.com/,https://i.imgur.com/BTJvvBK.png
-12tv.es,12tv,,,,ES,ES-VC,Alicante,s/ES-VC,spa,general,FALSE,,,,https://www.12tv.es/,https://i.imgur.com/VSTgXsh.png
-BurrianaTeVe.es,BurrianaTeVe,,,,ES,ES-VC,Castellón,s/ES-VC,cat,general,FALSE,,,,https://www.burrianateve.com/,https://i.imgur.com/G3nIGHh.png
 TV4S.rs,TV 4S,,,,RS,,,c/RS,srp,,FALSE,,,,,https://i.imgur.com/6LWcPu3.png
 TV4TNG.ch,TV4TNG,,,,CH,,,c/CH,deu,,FALSE,,,,,https://i.imgur.com/wpVofFP.png
 TV5.dz,TV5,,,,DZ,,,c/DZ,ara,,FALSE,,,,http://entv.dz/,https://i.imgur.com/zQr0SDM.png
@@ -29688,13 +29688,13 @@ XezerTV.az,Xezer TV,,,,AZ,,,c/AZ,aze,general,FALSE,,,,,https://i.imgur.com/YR5iC
 XezerXeber.az,Xezer Xeber,,,,AZ,,,c/AZ,aze,,FALSE,,,,https://www.xezerxeber.az/,https://i.imgur.com/AuB8bnq.png
 XFCTV.us,XFC TV,,,,US,,,c/US,eng,sports,FALSE,,,,https://watch.plex.tv/live-tv/channel/xfc-tv,https://i.imgur.com/LcfzmG0.png
 XHASDT2.us,XHAS-DT2,,LATV,,US,US-CA,San Diego,s/US-CA,eng,,FALSE,,,,,https://i.imgur.com/ScxwHYR.png
-XHILATDT.mx,XHILA-TDT,Canal 66,,Intermedia y Asociados Mexicali,MX,MX-BCN,Mexicali,s/MX-BCN,spa,general;news,FALSE,,,,http://www.canal66.tv/,https://i.imgur.com/rSeR402.png
 XHBCTDT.mx,XHBC-TDT,,,Grupo Televisa,MX,,Mexicali,c/MX,spa,,FALSE,,,,http://www.televisaregional.com/mexicali/,https://i.imgur.com/0qaZtwz.png
 XHCCATDT.mx,XHCCA-TDT,TRC TV,,Gobierno del Estado de Campeche,MX,,San Francisco de Campeche,c/MX,spa,entertainment,FALSE,1988-10-31,,,https://trccampeche.gob.mx/canal/,https://i.imgur.com/RzL5Z3P.png
 XHDFTDT.mx,XHDF-TDT,,,,MX,,,c/MX,eng,,FALSE,,,,,https://i.imgur.com/aVkbzvS.png
 XHFNTDT1.mx,XHFN-TDT1,Azteca 7,Azteca Noreste,TV Azteca,MX,,Monterrey,c/MX,spa,general,FALSE,1974-02-01,,,https://www.info7.mx/,https://i.imgur.com/aGup2ag.png
 XHGTDT.mx,XHG-TDT,,Televisa,,MX,MX-JAL,Guadalajara,s/MX-JAL,spa,,FALSE,,,,,https://i.imgur.com/0MaUvTd.png
 XHGVTDT.mx,XHGV-TDT,,TVMÁS,,MX,,,c/MX,spa,,FALSE,,,,,https://i.imgur.com/15kcNRb.png
+XHILATDT.mx,XHILA-TDT,Canal 66,,Intermedia y Asociados Mexicali,MX,MX-BCN,Mexicali,s/MX-BCN,spa,general;news,FALSE,,,,http://www.canal66.tv/,https://i.imgur.com/rSeR402.png
 XHJKTDT.mx,XHJK-TDT,,,,MX,,,c/MX,spa,,FALSE,,,,,https://i.imgur.com/ljjJwqE.png
 XHMNLTDT.mx,XHMNL-TDT,TV Nuevo León Canal 28,Radio y Television de Nuevo Leon,Gobierno del Estado de Nuevo Leon,MX,,Monterrey,c/MX,spa,education,FALSE,1982-05-14,,,https://srtvnl.com/,https://i.imgur.com/9qL4LJF.png
 XHPBZCTDT1.mx,XHPBZC-TDT1,,Sistema Estatal de Telecomunicaciones,,MX,MX-PUE,,s/MX-PUE,spa,,FALSE,,,,http://www.setpuebla.mx/television/,https://i.imgur.com/dbJKErB.png