diff --git a/data/channels.csv b/data/channels.csv
index b0253f98..f2d081b3 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -1896,8 +1896,8 @@ BaRiaVungTauTV.vn,Ba Ria Vung Tau TV,,,VN,,,c/VN,vie,,FALSE,,,,http://www.brt.vn
 BarkatTV.pk,Barkat TV,,,PK,,,c/PK,eng,,FALSE,,,,http://www.barkat.tv/,https://www.lyngsat.com/logo/tv/bb/barkat-tv-pk.png
 BarmedasTV.tz,Barmedas TV,,,TZ,,,c/TZ,eng,,FALSE,,,,https://www.barmedas.tv/,https://i.imgur.com/dJdxncO.png
 BarrandovKrimi.cz,Barrandov Krimi,,,CZ,,,c/CZ,ces,,FALSE,2015-05-19,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/5/57/Logo-krimi-barrandov-color.svg/512px-Logo-krimi-barrandov-color.svg.png
-BarricadaTV.ar,Barricada TV,,,AR,,,c/AR,spa,,FALSE,,,,https://www.barricadatv.org/?page_id=9173,https://www.barricadatv.org/wp-content/uploads/2018/11/logo-2018-negro.png
 BarRescue.us,Bar Rescue,,,US,,,c/US,eng,documentary,FALSE,,,,https://pluto.tv/en/live-tv/bar-rescue,https://images.pluto.tv/channels/60a3d889a5b3690008dc7fe8/colorLogoPNG.png
+BarricadaTV.ar,Barricada TV,,,AR,,,c/AR,spa,,FALSE,,,,https://www.barricadatv.org/?page_id=9173,https://www.barricadatv.org/wp-content/uploads/2018/11/logo-2018-negro.png
 BaryaTV.af,Barya TV,,,AF,,,c/AF,pus,,FALSE,,,,,https://i.imgur.com/yf5cI8r.jpg
 BashkirskoeSputnikovoeTV.ru,Bashkirskoe Sputnikovoe TV,,,RU,,,c/RU,rus,,FALSE,,,,https://bash.news/bst/,https://i.imgur.com/rxwTjuT.jpg
 Bashkortostan24.ru,Bashkortostan 24,,,RU,,,c/RU,rus,,FALSE,,,,,https://i.imgur.com/V35c8pb.png
@@ -1907,8 +1907,8 @@ BatteryPopXUMO.us,Battery Pop XUMO,,,US,,,c/US,eng,kids,FALSE,,,,,https://i.imgu
 BatuTV.id,Batu TV,,,ID,ID-JI,Batu,s/ID-JI,ind,,FALSE,2003-08-16,,,http://batutelevisi.com/,https://upload.wikimedia.org/wikipedia/id/4/4f/Batu_TV.png
 BayaTV.tn,Baya TV,,,TN,,,c/TN,ara,,FALSE,,,,https://www.bayatv.net,https://www.bayatv.net/images/logo.png
 BaynounahTV.ae,Baynounah TV,,,AE,,,c/AE,ara,,FALSE,,,,https://www.baynounah.ae/,https://www.lyngsat.com/logo/tv/bb/baynounah_tv_ae.png
-BayresTV.ar,Bayres TV,,,AR,AR-B,,s/AR-B,spa,,FALSE,,,,https://bayrestv.com.ar/,https://pbs.twimg.com/profile_images/3218050884/c2625c504f541d48a96442d5d1dacb87_400x400.jpeg
 BayonTV.kh,Bayon TV,,,KH,,,c/KH,khm,news,FALSE,,,,http://bayontv.com.kh/,https://i.imgur.com/2jbulL2.jpg
+BayresTV.ar,Bayres TV,,,AR,AR-B,,s/AR-B,spa,,FALSE,,,,https://bayrestv.com.ar/,https://pbs.twimg.com/profile_images/3218050884/c2625c504f541d48a96442d5d1dacb87_400x400.jpeg
 BayTV.za,Bay TV,,,ZA,,,c/ZA,eng,,FALSE,,,,http://www.bay-tv.co.za/,https://i.imgur.com/SNgbSZL.png
 BayuTVNganjuk.id,Bayu TV Nganjuk,,,ID,ID-JI,,s/ID-JI,ind,,FALSE,,,,https://www.bayutvpersada.com/,https://i.imgur.com/hnLpkOe.png
 Baywatch.us,Baywatch,,,US,,,c/US,eng,series,FALSE,,,,https://pluto.tv/en/live-tv/baywatch,https://images.pluto.tv/channels/5d815eb889bca2ce7b746fdd/colorLogoPNG.png
@@ -5729,8 +5729,8 @@ EpocaTV.co,Época TV,,,CO,,,c/CO,spa,,FALSE,,,,,https://www.lyngsat.com/logo/tv/
 EPoland.us,E! Poland,,,US,,,c/US,eng,,FALSE,,,,http://uk.eonline.com/,https://www.lyngsat.com/logo/tv/ee/e_global_us.png
 Epoque.ua,Epoque,,,UA,,,c/UA;c/RU,ukr;rus,,FALSE,,,,https://korysnetv.com/telekanaly/epokha,https://i.imgur.com/jiVnDEt.png
 ePosavjeTV.si,ePosavje TV,,,SI,,,c/SI,slv,,FALSE,,,,,https://tv2go.t-2.net/static/media/img/channels/dark/ios/small/retina/2528239.png
-EPSTV.ar,EPS TV,,,AR,AR-B,Bragrado,s/AR-B,spa,,FALSE,,,,https://noticiaseps.com.ar/tvvivopop.html,https://3.bp.blogspot.com/-qdX1xKfFHj8/VBZKR5VGAHI/AAAAAAAAzHQ/cm-kffchUkE/s1600/Canal5ePs.jpg
 EpsilonTV.gr,Epsilon TV,,,GR,,,c/GR,ell,,FALSE,,,,https://epsilontv.gr/,https://upload.wikimedia.org/wikipedia/commons/thumb/d/d1/Epsilontv_logo.jpg/512px-Epsilontv_logo.jpg
+EPSTV.ar,EPS TV,,,AR,AR-B,Bragrado,s/AR-B,spa,,FALSE,,,,https://noticiaseps.com.ar/tvvivopop.html,https://3.bp.blogspot.com/-qdX1xKfFHj8/VBZKR5VGAHI/AAAAAAAAzHQ/cm-kffchUkE/s1600/Canal5ePs.jpg
 EPTVCampinaseregiao.br,EPTV Campinas e região,,,BR,,,c/BR,por,,FALSE,,,,http://globoesporte.globo.com/sp/campinas-e-regiao/,https://www.lyngsat.com/logo/tv/ee/eptv_br.png
 EPTVCentral.br,EPTV Central,,,BR,,,c/BR,por,,FALSE,,,,https://redeglobo.globo.com/sp/eptv/,https://www.lyngsat.com/logo/tv/ee/eptv_br.png
 EPTVRibeiraoPretoeregiao.br,EPTV Ribeirão Preto e região,,,BR,,,c/BR,por,,FALSE,,,,http://globoesporte.globo.com/sp/ribeirao-preto-e-regiao/,https://www.lyngsat.com/logo/tv/ee/eptv_br.png
@@ -7632,6 +7632,7 @@ HT1Innviertel.at,HT 1 Innviertel,,,AT,,,c/AT,deu,,FALSE,,,,https://www.ht1.at/,h
 HtMusicChannelHungary.hu,H!t Music Channel Hungary,,,HU,,,c/HU,hun,music,FALSE,,,,http://hitmusic.hu/,https://i.imgur.com/sqC2hqV.png
 HtMusicChannelRomania.ro,H!t Music Channel Romania,,,RO,,,c/RO,ron,music,FALSE,,,,http://hitmusic.hu/,https://i.imgur.com/sqC2hqV.png
 HTV.mn,HTV,,,MN,,,c/MN,mon,,FALSE,,,,,https://www.lyngsat.com/logo/tv/hh/htv-mn.png
+HTV.us,HTV,,,US,,,c/US,spa,,FALSE,,,,,https://i.imgur.com/NlKFNHS.png
 HTV1.vn,HTV1,,,VN,,,c/VN,vie,,FALSE,,,,http://www.htv.com.vn/,https://i.imgur.com/DXN2hS2.png
 HTV1HoustonTelevision.us,HTV 1 Houston Television,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/zvj1boM.jpg
 HTV2.vn,HTV2,,,VN,,,c/VN,vie,,FALSE,,,,http://www.htv.com.vn/,https://i.imgur.com/tG5qKN6.png
@@ -7645,7 +7646,6 @@ HTV9HD.vn,HTV9 HD,,,VN,,,c/VN,vie,,FALSE,,,,http://www.htv.com.vn/,https://i.img
 HTVCFamily.vn,HTVC Family,,,VN,,,c/VN,vie,family,FALSE,,,,http://www.htv.com.vn/,https://www.lyngsat.com/logo/tv/hh/htvc_gia_dinh_vn.png
 HTVCPlus.vn,HTVC Plus,,,VN,,,c/VN,vie,entertainment,FALSE,2006-01-01,,,http://www.htv.com.vn/,https://i.imgur.com/7V8tv7K.png
 HTVCPureVietnamese.vn,HTVC Pure Vietnamese,,,VN,,,c/VN,vie,,FALSE,,,,http://www.htv.com.vn/,https://www.lyngsat.com/logo/tv/hh/htvc-thuan-viet-vn.png
-HTV.us,HTV,,,US,,,c/US,spa,,FALSE,,,,,https://i.imgur.com/NlKFNHS.png
 HTVSports.vn,HTV Sports,,,VN,,,c/VN,vie,sports,FALSE,,,,http://www.htv.com.vn/,https://www.lyngsat.com/logo/tv/hh/htv-the-thao-vn.png
 HuachoPeruTV.pe,Huacho Perú TV,,,PE,PE-LIM,Huacho,c/PE,spa,general,FALSE,,,,https://huachoperutv.com/,https://i.imgur.com/oC6tuLn.png
 HuantaTV.pe,Huanta TV,,,PE,PE-AYA,Huanta,c/PE,spa,,FALSE,,,,,https://i.imgur.com/71C0I0T.png
@@ -16029,8 +16029,8 @@ OBNGaammee.et,OBN Gaammee,,,ET,,,c/ET,orm,,FALSE,,,,,https://www.lyngsat.com/log
 OBNHornofAfrica.et,OBN Horn of Africa,,,ET,,,c/ET,orm,,FALSE,,,,,https://www.lyngsat.com/logo/tv/oo/obn-et.png
 ObossoTV.cg,Obosso TV,,,CG,,,c/CG,fra,,FALSE,,,,,https://i.imgur.com/UTo9vCc.jpg
 ObozrevatelTV.ua,Obozrevatel TV,,,UA,,,c/UA;c/RU,ukr,,FALSE,2020-02-13,,,https://www.obozrevatel.com/tv/,https://i.imgur.com/HAjQEk8.png
+OBSGyeonginTV.kr,OBS Gyeongin TV,OBS경인TV,,KR,,,c/KR,kor,,FALSE,2006-05-02,,,http://www.obs.co.kr/,https://i.imgur.com/oWB3ApR.png
 ObshchestvennoeNezavisimoeTelevidenie.ua,Obshchestvennoe Nezavisimoe Televidenie,,,UA,,,c/UA;c/RU,rus,,FALSE,,,,,https://i.imgur.com/NvhLjXU.jpg
-OBSKyungInTV.kr,OBS Kyung-In TV,,,KR,,,c/KR,kor,,FALSE,,,,http://www.obs.co.kr/,https://i.imgur.com/oWB3ApR.png
 OBSW.kr,OBS W,,,KR,,,c/KR,kor,,FALSE,,,,http://www.obsw.co.kr/,https://www.lyngsat.com/logo/tv/oo/obs_kr_w.png
 OBTV.gh,OB TV,,,GH,,,c/GH,eng,,FALSE,,,,,https://www.lyngsat.com/logo/tv/oo/ob-tv-gh.png
 OCaminhoAntigo.br,O Caminho Antigo,,,BR,,,c/BR,por,,FALSE,,,,http://ocaminhoantigo.tv/,https://www.lyngsat.com/logo/tv/oo/o-caminho-antigo-br.png
@@ -16567,7 +16567,6 @@ PeopleareAwesomeSpain.us,People are Awesome Spain,,,US,,,c/ES,spa,comedy,FALSE,,
 PeopleareAwesomeSweden.us,People are Awesome Sweden,,,US,,,c/US,eng,entertainment,FALSE,,,,,https://i.imgur.com/msHBlDz.png
 PeopleareAwesomeUK.us,People are Awesome UK,,,US,,,c/UK,eng,comedy,FALSE,,,,https://pluto.tv/en/live-tv/people-are-awesome-gb,https://images.pluto.tv/channels/5eb95d63b270fc0007c465e6/colorLogoPNG.png
 PeopleareAwesomeUS.us,People are Awesome US,,,US,,,c/US,spa,entertainment,FALSE,,,,https://pluto.tv/en/live-tv/people-are-awesome,https://images.pluto.tv/channels/5ebac65911406400078b8993/colorLogoPNG.png
-PeoplesTelevisionNetwork.ph,People's Television Network,,,PH,,,c/PH,eng,,FALSE,,,,https://ptvnews.ph/,https://upload.wikimedia.org/wikipedia/commons/thumb/1/10/People%27s_Televsion_Network_Incorporated_%28PTV%29.svg/512px-People%27s_Televsion_Network_Incorporated_%28PTV%29.svg.png
 PeoplesTV.ng,Peoples TV,,,NG,,,c/NG,eng,,FALSE,,,,https://ptvng.com/,https://www.lyngsat.com/logo/tv/pp/peoples-tv-ng.png
 PeoplesWeather.za,People's Weather,,,ZA,,,c/ZA,eng,weather,FALSE,,,,http://www.peoplesweather.com/,https://rndcdn.dstv.com/dstvcms/2020/04/03/People'sWeather_logo_2020_4-3_xlrg.png
 PeopleTV.th,People TV,,,TH,,,c/TH,tha,,FALSE,,,,,https://www.lyngsat.com/logo/tv/num/1_tv_th.png
@@ -17527,6 +17526,7 @@ PTS.tw,PTS,,,TW,,,c/TW,zho,,FALSE,,,,https://www.pts.org.tw/,https://i.imgur.com
 PTS3.tw,PTS 3,,,TW,,,c/TW,zho,,FALSE,,,,http://pts_3.pts.org.tw/,https://www.lyngsat.com/logo/tv/pp/pts_tw_3.png
 PTSTaigi.tw,PTS Taigi,,,TW,,,c/TW,zho,,FALSE,2004-07-01,,,https://taigi.pts.org.tw/,https://i.imgur.com/k8lASRM.png
 PTV.at,P-TV,,,AT,,,c/AT,deu,,FALSE,,,,,https://www.lyngsat.com/logo/tv/pp/p-tv-at.png
+PTV.ph,PTV,,,PH,,,c/PH,eng,,FALSE,,,,https://ptvnews.ph/,https://upload.wikimedia.org/wikipedia/commons/thumb/1/10/People%27s_Televsion_Network_Incorporated_%28PTV%29.svg/512px-People%27s_Televsion_Network_Incorporated_%28PTV%29.svg.png
 PTV4.ph,PTV 4,,,PH,,,c/PH,eng,news,FALSE,,,,,https://i.imgur.com/EPnbcPp.png
 PTVBolan.pk,PTV Bolan,,,PK,,,c/PK,urd,,FALSE,2005-08-14,,,,https://upload.wikimedia.org/wikipedia/en/3/30/Ptv_bolan.jpg
 PTVGlobal.pk,PTV Global,,,PK,,,c/PK,urd,,FALSE,2006-01-01,,,http://global.ptv.com.pk/,https://upload.wikimedia.org/wikipedia/en/e/e0/PTV_Global_logo.png
@@ -28541,8 +28541,8 @@ WZZMDT3.us,WZZM-DT3,,True Crime Network,US,US-MI,Grand Rapids,s/US-MI,eng,,FALSE
 WZZMDT4.us,WZZM-DT4,,Quest,US,US-MI,Grand Rapids,s/US-MI,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/en/thumb/8/85/Quest_logo.png/512px-Quest_logo.png
 WZZMDT5.us,WZZM-DT5,,Twist,US,US-MI,Grand Rapids,s/US-MI,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/en/thumb/5/5c/Twist_logo.svg/512px-Twist_logo.svg.png
 X1.al,X1,,,AL,,,c/AL,sqi,,FALSE,,,,https://www.digitalb.al/,https://www.lyngsat.com/logo/tv/dd/digit_alb_x.png
-XamaTV.ar,Xama TV,,,AR,AR-J,,s/AR-J,spa,,FALSE,,,,https://canal40hd.com.ar/,https://pbs.twimg.com/profile_images/1526235314699784199/slPIDS-W_400x400.jpg
 XalastraTV.gr,Xalastra TV,,,GR,,,c/GR,ell,music,FALSE,,,,,https://i.imgur.com/LgQBtTh.jpg
+XamaTV.ar,Xama TV,,,AR,AR-J,,s/AR-J,spa,,FALSE,,,,https://canal40hd.com.ar/,https://pbs.twimg.com/profile_images/1526235314699784199/slPIDS-W_400x400.jpg
 Xcorps.us,Xcorps,,,US,,,c/US,eng,series,FALSE,,,,,https://i.imgur.com/SDKWWQu.png
 Xee.dk,Xee,,,DK,,,c/DK,dan,,FALSE,,,,,https://images.ctfassets.net/989y85n5kcxs/6BDr1eCRvgpwFRecknnYBk/65252b41a3a4cc5f6da7a551dc665170/xee-shop.png
 XEFBTDT.mx,XEFB-TDT,,Televisa,MX,MX-NLE,Monterrey,s/MX-NLE,spa,,FALSE,,,,,https://imagenes.gatotv.com/logos/canales/oscuros/4_de_monterrey-mediano.png