diff --git a/data/channels.csv b/data/channels.csv
index 30f06046..1e66180d 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -2722,7 +2722,7 @@ BoomTV.za,Boom TV,,,,ZA,,,c/ZA,por,,FALSE,,,,http://www.dstv.com/,https://i.imgu
 BoonieCubsTV.us,Boonie Cubs TV,,,,US,,,c/US,eng,,FALSE,,,,https://watch.plex.tv/live-tv/channel/boonie-cubs-tv,https://i.imgur.com/CsUeavL.png
 BoonjanPanneeTV123.th,Boonjan Pannee TV 123,,,,TH,,,c/TH,tha,,FALSE,,,,,https://i.imgur.com/KAu7QVY.png
 BoonmaTV.th,Boonma TV,,,,TH,,,c/TH,tha,,FALSE,,,,http://www.boonmaonline.com/,https://i.imgur.com/hGloVxz.png
-BoonniyomTV.th,Boonniyom TV,Network (optional),,,TH,,Bangkok,c/TH,tha,religious,FALSE,,,,https://www.boonniyom.net/,https://i.imgur.com/KvdFCD5.png
+BoonniyomTV.th,Boonniyom TV,,,,TH,,Bangkok,c/TH,tha,religious,FALSE,,,,https://www.boonniyom.net/,https://i.imgur.com/KvdFCD5.png
 BoPlusTV.bo,Bo Plus TV,,,,BO,,,c/BO,spa,,FALSE,,,,https://boplus.tv/,https://i.imgur.com/09zGiLH.png
 BorderTV.ke,Border TV,,,,KE,,,c/KE,eng,,FALSE,,,,,https://i.imgur.com/KRIwGUP.png
 Boreal.do,Boreal,,,,DO,,,c/DO,spa,,FALSE,,,,https://borealtelevision.com/,https://i.imgur.com/KSquHTG.png
@@ -6075,7 +6075,7 @@ DuniaSinema.my,Dunia Sinema,,,,MY,,,c/MY,msa,,FALSE,,,,https://unifi.com.my/tv,h
 DunyaEntertainment.pk,Dunya Entertainment,,,,PK,,,c/PK,eng,entertainment,FALSE,,,,,https://www.lyngsat.com/logo/tv/dd/dunya_news_tv_pk_entertainment.png
 DunyaNews.pk,Dunya News,دنیا نیوز,,Mian Amer Mehmood,PK,,,c/PK,urd,news,FALSE,2008-12-01,,,https://dunyanews.tv/live/,https://i.imgur.com/1PbtW0y.png
 DunyaNewsUK.uk,Dunya News UK,,,,UK,,London,c/UK,urd;eng,news,FALSE,,,,https://dunyanews.tv/,https://i.imgur.com/dtrTfZC.png
-DunyaNewsUSA.us,Dunya News USA,Network (optional),,,US,US-NY,Fresh Meadows,c/US,urd;eng,news,FALSE,2008-12-01,,,https://dunyanews.tv/en/usa_channel,https://i.imgur.com/L3TMeZy.png
+DunyaNewsUSA.us,Dunya News USA,,,,US,US-NY,Fresh Meadows,c/US,urd;eng,news,FALSE,2008-12-01,,,https://dunyanews.tv/en/usa_channel,https://i.imgur.com/L3TMeZy.png
 Dunyoboylab.uz,Dunyo bo'ylab,,,,UZ,,,c/UZ,uzb,,FALSE,,,,https://www.mtrk.uz/uz/tv/dunyo/,https://i.imgur.com/KArB5U6.png
 Duo3.ee,Duo 3,,,,EE,,,c/EE,lit;rus;est;lav,,FALSE,,,,,https://i.imgur.com/bSzjidl.png
 Duo4.ee,Duo 4,,,Duo Media Networks,EE,,,c/EE,est,,FALSE,2008-03-01,,,https://kanal11.postimees.ee/,https://i.imgur.com/FOYFAfm.png
@@ -8053,9 +8053,9 @@ HagerieTV.us,Hagerie TV,,,,US,,,c/US,amh,,FALSE,,,,,https://i.imgur.com/8ezpYmX.
 HaGiangTV.vn,Ha Giang TV,,,,VN,,,c/VN,vie,,FALSE,,,,http://hagiangtv.vn/,https://i.imgur.com/zXqjjUf.png
 HaHa.rs,Ha Ha,,,,RS,,,c/RS,srp,,FALSE,,,,http://www.pink.rs/haha,https://i.imgur.com/KS8dNNR.png
 HAHATV.sk,HAHA TV,,,Antik Telecom,SK,,,c/CZ;c/SK,slk,entertainment,FALSE,,,,,https://www.sms.cz/kategorie/televize/bmp/loga/velka/hahatv.png
-HaikouComprehensiveChannel.cn,Haikou Comprehensive Channel,Network (optional),,,CN,,Haikou,c/CN,zho,news,FALSE,,,,http://www.hkbtv.cn/,https://i.imgur.com/YfMM4x8.png
-HaikouLifeEntertainmentChannel.cn,Haikou Life & Entertainment Channel,Network (optional),,,CN,,Haikou,c/CN,zho,entertainment;lifestyle,FALSE,,,,http://www.hkbtv.cn/,https://i.imgur.com/zuqTOEX.png
-HaikouUrbanRuralEconomicChannel.cn,Haikou Urban & Rural Economic Channel,Network (optional),,,CN,,Haikou,c/CN,zho,business,FALSE,,,,http://www.hkbtv.cn/,https://i.imgur.com/faF6YPy.png
+HaikouComprehensiveChannel.cn,Haikou Comprehensive Channel,,,,CN,,Haikou,c/CN,zho,news,FALSE,,,,http://www.hkbtv.cn/,https://i.imgur.com/YfMM4x8.png
+HaikouLifeEntertainmentChannel.cn,Haikou Life & Entertainment Channel,,,,CN,,Haikou,c/CN,zho,entertainment;lifestyle,FALSE,,,,http://www.hkbtv.cn/,https://i.imgur.com/zuqTOEX.png
+HaikouUrbanRuralEconomicChannel.cn,Haikou Urban & Rural Economic Channel,,,,CN,,Haikou,c/CN,zho,business,FALSE,,,,http://www.hkbtv.cn/,https://i.imgur.com/faF6YPy.png
 HainanChildrensChannel.cn,Hainan Children's Channel,HNTV-4,,Hainan Broadcasting Group,CN,,Haikou,c/CN,zho,kids;animation,FALSE,,,,http://www.hnntv.cn/live/qslive/,https://i.imgur.com/mOBVaPl.png
 HainanCultureTravelChannel.cn,Hainan Culture & Travel Channel,HNTV-3,,Hainan Broadcasting Group,CN,,Haikou,c/CN,zho,culture,FALSE,,,,http://www.hnntv.cn/live/yslive/,https://i.imgur.com/Dl2SwMb.png
 HainanFreeTradeChannel.cn,Hainan Free Trade Channel,HNTV-1,,Hainan Broadcasting Group,CN,,Haikou,c/CN,zho,business,FALSE,,,,http://www.hnntv.cn/live/zhlive/,https://i.imgur.com/IZMFaLO.png
@@ -15152,7 +15152,7 @@ MagicTV.bg,Magic TV,,,,BG,,,c/BG,bul,,FALSE,,,,https://www.magic.bg/,https://i.i
 MagicTV.gr,Magic TV,,,,GR,,,c/GR,ell,music,FALSE,,,,,https://i.imgur.com/QZQhg6C.png
 MagicTV.ro,Magic TV,,,Antenna Entertainment,RO,RO-B,Buchares,c/RO,ron,music,FALSE,2016-09-15,,,https://www.magicfm.ro/magictv,https://i.imgur.com/sFIqiw4.png
 MagnaChannel.id,Magna Channel,Magna TV,,,ID,,,c/ID,ind,,FALSE,,,,,https://i.imgur.com/tfJo0SO.png
-Magnat.ru,Magnat,Network (optional),,,RU,,Moscow,c/RU,rus,shop,FALSE,,,,https://tvmagnat.tv/pryamoy-efir/,https://i.imgur.com/r485aZL.png
+Magnat.ru,Magnat,,,,RU,,Moscow,c/RU,rus,shop,FALSE,,,,https://tvmagnat.tv/pryamoy-efir/,https://i.imgur.com/r485aZL.png
 MagnavisionTV.uk,Magnavision TV,,,,UK,,,c/UK,mal,entertainment,FALSE,,,,https://magnavision.tv/,https://i.imgur.com/mUHixbi.png
 MagnoliaNetwork.us,Magnolia Network,,,,US,,,c/US,eng,,FALSE,2022-01-05,,,http://www.magnolia.com/network,https://upload.wikimedia.org/wikipedia/commons/thumb/4/40/Magnolia_Network.svg/512px-Magnolia_Network.svg.png
 MagnoliaNetworkCanada.ca,Magnolia Network Canada,,,,CA,,,c/CA,eng,,FALSE,2022-01-05,,,http://magnolianetwork.ca/,https://upload.wikimedia.org/wikipedia/commons/thumb/4/40/Magnolia_Network.svg/512px-Magnolia_Network.svg.png
@@ -15192,7 +15192,7 @@ MajorChannelMix.th,Major Channel Mix,,,,TH,,,c/TH,tha,,FALSE,,,,https://www.mvtv
 Makan33.il,Makan 33,,,Israeli Public Broadcasting Corporation,IL,,,c/IL,ara,,FALSE,2017-05-15,,,https://www.makan.org.il/,https://i.imgur.com/RVtQTed.png
 MakaoTV.do,Makao TV,,,,DO,DO-11,,c/DO,spa,,FALSE,,,,https://makaoradio.com/#makaotv,https://i.imgur.com/asD5y7i.png
 MakedoniaTV.gr,Makedonia TV,,,Makedonia TV S.M.S.A.,GR,,,c/GR,ell,,FALSE,1991-01-01,,,https://www.maktv.gr/,https://upload.wikimedia.org/wikipedia/commons/thumb/6/61/Main_Logo_alt.png/512px-Main_Logo_alt.png
-MakedonskoSonce.mk,Makedonsko Sonce,Network (optional),,,MK,,,c/MK,mkd,general,FALSE,,,,http://makedonskosonce.com/,https://i.imgur.com/uDokcwS.jpg
+MakedonskoSonce.mk,Makedonsko Sonce,,,,MK,,,c/MK,mkd,general,FALSE,,,,http://makedonskosonce.com/,https://i.imgur.com/uDokcwS.jpg
 Makeful.ca,Makeful,,,Blue Ant Media Rock Entertainment Holdings,CA,,,c/CA,eng,,FALSE,2005-03-05,,,https://tv.bemakeful.com/,https://upload.wikimedia.org/wikipedia/commons/9/9e/Makeful_TV.png
 MakkahTV.sa,Makkah TV,,,,SA,,,c/SA,ara,religious,FALSE,,,,https://makkahtv.tv/,https://i.imgur.com/PRPcOi0.png
 MakkalTV.in,Makkal TV,,,Makkal Tholai Thodarpu Kuzhumam Ltd,IN,,,c/IN,tam,general,FALSE,2006-09-06,2016-04-01,,https://makkal.tv/,https://i.imgur.com/gmnHoRu.png
@@ -16070,7 +16070,7 @@ MtavariArkhi.ge,Mtavari Arkhi,,,,GE,,,c/GE,kat,,FALSE,2019-08-17,,,https://mtava
 MtBluePublicTV.us,Mt. Blue Public TV,MBTV,,,US,US-TX,Farmington,s/US-TX,eng,legislative,FALSE,,,,https://mtbluetv.org/,https://i.imgur.com/zGuFAJs.png
 MTC.us,MTC,,,,US,,,c/US,eng,,FALSE,,,,http://www.mellitv.com/,https://i.imgur.com/JxoAR4j.png
 MtKenyaTV.ke,Mt Kenya TV,,,,KE,,,c/KE,eng,,FALSE,,,,,https://i.imgur.com/pfDiV9H.png
-MTM.mk,MTM,Network (optional),,,MK,,,c/MK,mkd,general,FALSE,,,,https://mtm.mk/,https://i.ibb.co/HCRZVVz/images-4.png
+MTM.mk,MTM,,,,MK,,,c/MK,mkd,general,FALSE,,,,https://mtm.mk/,https://i.ibb.co/HCRZVVz/images-4.png
 MTN.kr,MTN,MTN 머니투데이방송,,,KR,,,c/KR,kor,,FALSE,,,,http://www.mtn.co.kr/,https://i.imgur.com/MS0lqoG.png
 MTNATV.cl,MTNA TV,Metanoia TV,,,CL,,Valdivia,c/CL,spa,religious,FALSE,,,,https://www.mtna.tv/,https://i.imgur.com/v7SA92F.png
 MTNSpecialEvents.us,MTN Special Events,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/ezmsmtV.png
@@ -17472,7 +17472,7 @@ NTDTVAsiaPacific.us,NTD TV Asia-Pacific,,,,US,,,c/US,zho,,FALSE,,,,http://www.nt
 NTDTVChina.us,NTD TV China,,,,US,,,c/US,zho,,FALSE,,,,https://www.ntdtv.com/,https://i.imgur.com/OpWTWdh.png
 NTDTVEast.us,NTD TV East,,,,US,,,c/US,zho,,FALSE,,,,https://www.ntdtv.com/,https://i.imgur.com/QtFM5Oo.png
 NTDTVEurope.us,NTD TV Europe,,,,US,,,c/US,zho,,FALSE,,,,https://www.ntdtv.com/,https://www.lyngsat.com/logo/tv/nn/ntd-tv-us.png
-NTDTVWest.us,NTD TV West,Network (optional),,Epoch Media Group,US,US-NY,New York City,c/US,zho;eng,general,FALSE,2001-12-03,,,https://www.ntd.com/,https://i.imgur.com/Ao48HRT.png
+NTDTVWest.us,NTD TV West,,,Epoch Media Group,US,US-NY,New York City,c/US,zho;eng,general,FALSE,2001-12-03,,,https://www.ntd.com/,https://i.imgur.com/Ao48HRT.png
 NTK.kz,NTK,НТК,,,KZ,,,c/KZ,kaz,,FALSE,,,,http://www.ntk.kz/,https://i.imgur.com/hHSCH4L.png
 NTM.ru,NTM,НТМ,,,RU,,,c/RU,rus,,FALSE,,,,https://ntm13.ru/,https://i.imgur.com/AH50pGT.png
 NTN.it,NTN,Nuova TV Nazionale,,Giorgio Mendella,IT,,Pistoia,c/IT,ita,general,FALSE,,,,https://www.nuovatvnazionale.it/,https://i.imgur.com/AW5fJwa.png
@@ -21860,7 +21860,7 @@ StarComedy.us,Star Comedy,,,,US,,,c/US,eng,comedy,FALSE,,,,,https://i.imgur.com/
 StarEntertainmentChannel.hk,Star Entertainment Channel,SEC;星衛娛樂台,,The Walt Disney Company,HK,,,c/HK,zho,movies,FALSE,2012-12-01,,,https://www.dngtw.tw/sec/,https://i.imgur.com/c8tHTne.png
 StarEPlus.tz,Star E +,,,,TZ,,,c/TZ,eng,,FALSE,,,,,https://i.imgur.com/8kb4HKD.png
 StarFamily.ua,Star Family,,,,UA,,,c/UA;c/RU,rus,family,FALSE,,,,,https://i.imgur.com/eGuGHnZ.png
-StarFolkTV.mk,Star Folk TV,Network (optional),,,MK,,,c/MK,mkd,music,FALSE,,,,https://starfolk.net/,https://i.imgur.com/fM7FUgk.png
+StarFolkTV.mk,Star Folk TV,,,,MK,,,c/MK,mkd,music,FALSE,,,,https://starfolk.net/,https://i.imgur.com/fM7FUgk.png
 StarFun.us,Star Fun,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/5AbAkPU.png
 StarFunPlus3.us,Star Fun +3,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/nbjDDBg.png
 StarGold.in,Star Gold,,,,IN,,,c/IN,hin,,FALSE,,,,https://www.startv.com/,https://i.imgur.com/QgP64Zf.png
@@ -21889,7 +21889,7 @@ StarMoviesPlus.tz,Star Movies +,,,,TZ,,,c/TZ,eng,movies,FALSE,,,,,https://i.imgu
 StarMoviesSelect.in,Star Movies Select,,,,IN,,,c/IN,hin,movies,FALSE,2015-07-09,,,http://www.starmovies.in/,https://i.imgur.com/UomTc3O.png
 StarPlus.al,Star Plus,,,,AL,,Shkoder,c/AL,sqi,news,FALSE,,,,https://www.starplus-tv.com/,https://i.imgur.com/11PVpHQ.png
 StarPlus.in,StarPlus,,Disney Star,The Walt Disney Company,IN,,,c/IN,hin,,FALSE,,,,http://www.hotstar.com/channels/star-plus,https://i.imgur.com/aU7rexQ.png
-StarPlusTelevizija.mk,Star Plus Televizija,Network (optional),,,MK,,,c/MK,mkd,music,FALSE,,,,https://starplustv.com/,https://i.imgur.com/01yz22a.png
+StarPlusTelevizija.mk,Star Plus Televizija,,,,MK,,,c/MK,mkd,music,FALSE,,,,https://starplustv.com/,https://i.imgur.com/01yz22a.png
 StarPravah.in,Star Pravah,,,Disney Star,IN,,,c/IN,mar;kan,,FALSE,2008-11-24,,,https://www.hotstar.com/channels/star-pravah,https://i.imgur.com/ZT0u7AK.png
 StarReligion.tz,Star Religion,,,,TZ,,,c/TZ,swa,religious,FALSE,,,,,https://i.imgur.com/07xP4BE.png
 StarrTV.gh,Starr TV,,,,GH,,,c/GH,eng,,FALSE,,,,,https://i.imgur.com/QDatuK7.png
@@ -24804,7 +24804,7 @@ TVOost.be,TV Oost,,,,BE,,,c/BE,nld,,FALSE,,,,,https://static.tvoost.be/tvoostbe/
 TVOPiura.pe,TVO Piura,,,,PE,PE-PIU,Piura,s/PE-PIU,spa,,FALSE,,,,https://tvopiura.com/,https://i.imgur.com/tirNmLc.png
 TVOpoja.xk,TV Opoja,,,,XK,,,c/XK,sqi,,FALSE,,,,,https://i.imgur.com/hxi4Qiq.png
 TVOrange.nl,TV Orange,TV Oranje,,MuziekKiosk,NL,,,c/NL,nld,,FALSE,2005-10-05,,,https://www.tvoranje.nl/,https://i.imgur.com/4EQIm6x.png
-TVOrbis.mk,TV Orbis,Network (optional),,,MK,,,c/MK,mkd,general,FALSE,,,,https://www.tvorbis.com.mk/,https://i.imgur.com/TlzpQy6.png
+TVOrbis.mk,TV Orbis,,,,MK,,,c/MK,mkd,general,FALSE,,,,https://www.tvorbis.com.mk/,https://i.imgur.com/TlzpQy6.png
 TVOsaka.jp,TV Osaka,,,,JP,,,c/JP,jpn,,FALSE,1981-01-23,,,http://www.tv-osaka.co.jp/,https://i.imgur.com/rUmrruq.png
 TVOSanVicente.cl,TVO San Vicente,,,,CL,CL-LI,San Vicente,c/CL,spa,,FALSE,,,,http://www.tvosanvicente.cl/,https://i.imgur.com/PCVWtHd.png
 TVOsorioNews.br,TV Osorio News,TV Osório News,,,BR,BR-RS,Osório,s/BR-RS,por,news,FALSE,,,,https://www.tvosorionews.com.br/,https://i.imgur.com/cmgM4nA.png
@@ -25221,7 +25221,7 @@ TVXyz.gh,TV Xyz,,,,GH,,,c/GH,eng,,FALSE,,,,http://myxyzonline.com/,https://i.img
 TVYesItalia.it,TV Yes Italia,,,,IT,,,c/IT,ita,,FALSE,,,,,https://i.imgur.com/3CDxatu.png
 TVYUEco.rs,TV YU Eco,,,,RS,,,c/RS,srp,,FALSE,,,,,https://i.imgur.com/n7XUQqe.png
 TVZapad.hr,TV Zapad,Televizija Zapad;TVZ,,,HR,,,c/HR,hrv,general,FALSE,,,,https://zapad.tv/,https://i.imgur.com/cgCeX12.png
-TVZdravkin.mk,TV Zdravkin,Network (optional),,,MK,,,c/MK,mkd,general,FALSE,,,,,https://i.imgur.com/w4rRUNQ.png
+TVZdravkin.mk,TV Zdravkin,,,,MK,,,c/MK,mkd,general,FALSE,,,,,https://i.imgur.com/w4rRUNQ.png
 TVZimbo.ao,TV Zimbo,,,Medianova,AO,,,c/AO,por,general,FALSE,,,,http://www.tvzimbo.co.ao/,https://i.imgur.com/ZzFEwWX.png
 TVZlatar.rs,TV Zlatar,,,,RS,,,c/RS,srp,,FALSE,,,,,https://i.imgur.com/LYekTZf.png
 TVZonaPlus.rs,TV Zona Plus,,,,RS,,,c/RS,srp,,FALSE,,,,,https://i.imgur.com/DLZvZft.png