diff --git a/data/channels.csv b/data/channels.csv
index 23506f1c..c8108fab 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -324,10 +324,6 @@ ABCTVTAS.au,ABC TV TAS,,ABC Television,Australian Government,AU,,,c/AU,eng,,FALS
 ABCTVVIC.au,ABC TV VIC,,ABC Television,Australian Government,AU,,,c/AU,eng,,FALSE,,,,https://iview.abc.net.au/channel/abc1,https://i.imgur.com/Ekjb7w8.png
 ABCTVWA.au,ABC TV WA,,ABC Television,Australian Government,AU,,,c/AU,eng,,FALSE,,,,https://iview.abc.net.au/channel/abc1,https://i.imgur.com/Ekjb7w8.png
 ABCWest.us,ABC West,,,,US,,,c/US,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/ABC-2021-LOGO.svg/512px-ABC-2021-LOGO.svg.png
-TV15.us,TV15,,,,US,US-TX,Victoria,s/US-TX,eng,legislative,FALSE,,,,https://www.victoriatx.gov/209/Watch-TV15,https://i.imgur.com/Um8Gg2D.png
-TheColonyGovernmentAccess.us,The Colony Government Access,,,,US,US-TX,The Colony,s/US-TX,eng,general,FALSE,,,,https://www.thecolonytx.gov/604/Live-Video-Stream,https://i.imgur.com/RinoaRq.png
-TEMTV.us,TEM TV,,,,US,US-TX,Temple,s/US-TX,eng,legislative,FALSE,,,,https://www.templetx.gov/services/watch/channel_10_-_tem_tv.php,https://i.imgur.com/aMIEXo2.png
-SLTV16.us,SLTV 16,,,,US,US-TX,Sugar Land,s/US-TX,eng,general,FALSE,,,,https://www.sugarlandtx.gov/297/SLTV-16,https://i.imgur.com/3pErwWR.png
 AbileneTelevisionNetwork.us,Abilene Television Network,,,,US,US-TX,Abilene,s/US-TX,eng,general,FALSE,,,,https://abilenetx.gov/561/Live-Archived-Video,https://i.imgur.com/daTJZmM.png
 AbilityTV.gh,Ability TV,,,,GH,,,c/GH,eng,,FALSE,,,,,https://i.imgur.com/3RrZgdP.png
 AbingtonCAMEducationChannel.us,Abington CAM Education Channel,,,,US,US-MA,Abington,s/US-MA,eng,education,FALSE,,,,https://www.abingtoncam.tv/education/,https://i.imgur.com/tUgwRRk.png
@@ -595,12 +591,7 @@ AFV.us,AFV,,,,US,,,c/US,eng,comedy,FALSE,,,,,https://i.imgur.com/TOB9vmW.png
 AFVEspanol.us,AFV Espanol,AFV Español,,,US,,,c/US,spa,comedy,FALSE,,,,https://watch.plex.tv/live-tv/channel/afv-espanol,https://i.imgur.com/HUK4WXC.png
 AFVFamily.us,AFV Family,,,,US,,,c/US,eng,comedy,FALSE,,,,,https://i.imgur.com/dLSKBEn.png
 AfyonTurkTV.tr,Afyon Turk TV,Afyon Türk TV,,,TR,,,c/TR,tur,,FALSE,,,,,https://i.ibb.co/tXbD8Sz/8A1HOMZ.png
-GoodNewsToday.in,Good News Today,GNT,,TV Today Network,IN,,Noida,c/IN,hin,news,FALSE,2021-09-05,,,https://www.gnttv.com/livetv,https://i.imgur.com/iMzUrb9.png
-INH24x7.in,INH 24x7,,,,IN,,Raipur,c/IN,hin;hne,news,FALSE,,,,https://www.inhnews.in/livetv,https://i.imgur.com/Es3QiVx.png
 AgamvaniChannel.in,Agamvani Channel,,,,IN,,,c/IN,hin,,FALSE,,,,https://www.agamvani.com/,https://i.imgur.com/dQI1YkX.png
-HarKhabar.in,Har Khabar,हर ख़बर,,Sadhna Broadcast Limited,IN,,Noida,c/IN,hin,news,FALSE,,,,https://harkhabar.news/live-tv/,https://i.imgur.com/QwZherx.png
-HarvestTV.in,Harvest TV,,,Bibi George Chacko,IN,,Thiruvananthapuram,c/IN,mal,religious,FALSE,,,,https://harvesttv.in/,https://i.imgur.com/Aoq6mpT.png
-HarvestTVKeralam.in,Harvest TV Keralam,,,Bibi George Chacko,IN,,Thiruvananthapuram,c/IN,mal,religious,FALSE,,,,https://www.harvesttvkeralam.live/,https://i.imgur.com/1DyPuIt.png
 AgapeTV.sv,Agape TV,,,,SV,,,c/SV,spa,,FALSE,,,,,https://i.imgur.com/DsGmrnc.png
 AgapeTV.za,Agape TV,,,,ZA,,,c/ZA,eng,,FALSE,,,,,https://i.imgur.com/eV2dKNR.png
 AgapeTVNetwork.tz,Agape TV Network,,,,TZ,,,c/TZ,eng,,FALSE,,,,,https://i.imgur.com/EOFnL3O.png
@@ -1014,8 +1005,8 @@ AmenuveveTV.gh,Amenuveve TV,,,,GH,,,c/GH,eng,,FALSE,,,,,https://i.imgur.com/dnnw
 AmericaInternacional.ar,America Internacional,América Internacional,,,AR,,,r/INT,spa,general,FALSE,,,,https://www.americatv.com.ar/,https://i.imgur.com/5GxGeDn.png
 AmericanClassics.us,American Classics,,,,US,,,c/US,eng,movies,FALSE,,,,,https://i.imgur.com/IkYZQ9S.png
 AmericanGladiators.us,American Gladiators,,,,US,,,c/US,eng,series,FALSE,,,,https://www.pluto.tv/tv/american-gladiators,https://i.imgur.com/3Vf9Mka.png
-AmericanHeroesChannelCanada.ca,American Heroes Channel Canada,,,,CA,,,c/CA,eng,,FALSE,,,,http://www.ahctv.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/American_Heroes_Channel_logo.svg/512px-American_Heroes_Channel_logo.svg.png
 AmericanHeroesChannel.us,American Heroes Channel,,,,US,,,c/US,eng,,FALSE,,,,http://www.ahctv.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/American_Heroes_Channel_logo.svg/512px-American_Heroes_Channel_logo.svg.png
+AmericanHeroesChannelCanada.ca,American Heroes Channel Canada,,,,CA,,,c/CA,eng,,FALSE,,,,http://www.ahctv.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/7/75/American_Heroes_Channel_logo.svg/512px-American_Heroes_Channel_logo.svg.png
 AmericanHorrors.us,American Horrors,,,,US,,,c/US,eng,movies,FALSE,,,,,https://i.imgur.com/JLkzt7v.jpg
 AmericanHorrorsClassic.us,American Horrors Classic,,,American Horrors,US,,,c/US,eng,movies,FALSE,,,,,https://i.imgur.com/zsJ7Ehr.png
 AmericaParaguay.py,America Paraguay,América Paraguay,,,PY,,,c/PY,spa,general,FALSE,,,,https://www.americatv.com.ar/,https://i.imgur.com/rCEu3fM.png
@@ -7569,6 +7560,7 @@ GoodIdeaTV.th,Good Idea TV,,,,TH,,,c/TH,tha,entertainment,FALSE,,,,http://www.go
 GoodLife.il,Good Life,,,,IL,,,c/IL,heb,,FALSE,,,,https://xnet.ynet.co.il/home/0,https://i.imgur.com/BFcTNXQ.png
 GoodLife45.us,GoodLife 45,,,,US,,,c/US,eng,religious,FALSE,,,,,https://i.imgur.com/AQfVNMK.png
 GoodnessTV.in,Goodness TV,,,,IN,,,c/IN,mal,,FALSE,,,,,https://i.imgur.com/DwLYWdK.png
+GoodNewsToday.in,Good News Today,GNT,,TV Today Network,IN,,Noida,c/IN,hin,news,FALSE,2021-09-05,,,https://www.gnttv.com/livetv,https://i.imgur.com/iMzUrb9.png
 GoodNewsTV.in,GoodNews TV,,,,IN,,,c/IN,eng,news,FALSE,,,,https://goodnewstelevision.com/,https://i.imgur.com/ZrvoGqS.png
 GoodnewsTV.uk,Goodnews TV,,,,UK,,,c/UK,eng,news,FALSE,,,,https://www.goodnewsworld.tv/,https://i.imgur.com/xi7ShaQ.png
 GoodrichTV.rw,Goodrich TV,,,,RW,,,c/RW,eng,,FALSE,,,,http://goodrichtv.rw/,https://i.imgur.com/0LLqCFI.png
@@ -7815,11 +7807,14 @@ HaqTV.mz,Haq TV,,,,MZ,,,c/MZ,por,,FALSE,,,,http://www.haqtv.co.mz/,https://i.img
 HardKnocks.ca,Hard Knocks,,,,CA,,,c/CA,eng,sports,FALSE,,,,,https://i.imgur.com/nt9B6jx.png
 HareKrsnaTV.in,Hare Krsna TV,,,Hare Krsna Content Broadcast Pvt. Ltd.,IN,,,c/IN,hin,,FALSE,,,,https://www.harekrsnatv.com/,https://i.imgur.com/sZgON5J.png
 HarithaTV.lk,Haritha TV,,,Sri Jinarathana Educational Institute of the Hunupitiya Gangaramaya Temple,LK,,,c/LK,sin,,FALSE,2021-03-31,,,https://harithanetwork.com/,https://i.imgur.com/cepKOpH.png
+HarKhabar.in,Har Khabar,हर ख़बर,,Sadhna Broadcast Limited,IN,,Noida,c/IN,hin,news,FALSE,,,,https://harkhabar.news/live-tv/,https://i.imgur.com/QwZherx.png
 HarleyDavidsonFactoryTV.us,Harley Davidson Factory TV,,,,US,,,c/US,eng,auto,FALSE,,,,,https://i.imgur.com/DQOp8Ft.png
 HarleyDavidsonRacingTV.us,Harley Davidson Racing TV,,,,US,,,c/US,eng,auto,FALSE,,,,,https://i.imgur.com/DQOp8Ft.png
 HarleyDavidsonRidesTV.us,Harley Davidson Rides TV,,,,US,,,c/US,eng,auto,FALSE,,,,,https://i.imgur.com/DQOp8Ft.png
 HarleyDavidsonTV.us,Harley Davidson TV,,,,US,,,c/US,eng,auto,FALSE,,,,,https://i.imgur.com/DQOp8Ft.png
 HarPalGeo.us,HarPal Geo,,,,US,,,c/US,urd,,FALSE,,,,https://harpalgeo.tv/,https://i.imgur.com/NX3vvAX.png
+HarvestTV.in,Harvest TV,,,Bibi George Chacko,IN,,Thiruvananthapuram,c/IN,mal,religious,FALSE,,,,https://harvesttv.in/,https://i.imgur.com/Aoq6mpT.png
+HarvestTVKeralam.in,Harvest TV Keralam,,,Bibi George Chacko,IN,,Thiruvananthapuram,c/IN,mal,religious,FALSE,,,,https://www.harvesttvkeralam.live/,https://i.imgur.com/1DyPuIt.png
 HastingsCommunityTV.us,Hastings Community TV,HCTV,,,US,US-MN,Hastings,s/US-MN,eng,general,FALSE,,,,https://www.hastingstv.org/,https://i.imgur.com/ExZFTXs.png
 HastiTV.ir,Hasti TV,,,,IR,,,c/IR,fas,,FALSE,,,,https://hastitv.com/,https://i.imgur.com/vwjcP7X.png
 HaTinhTV.vn,Ha Tinh TV,,,,VN,,,c/VN,vie,,FALSE,,,,https://hatinhtv.vn/,https://i.imgur.com/4yIgKKx.png
@@ -8555,6 +8550,7 @@ InfoWars.us,InfoWars,,,,US,,,c/US,eng,news,FALSE,,,,https://www.infowars.com/,ht
 IngenioFM.ar,Ingenio FM,,,,AR,,,c/AR,spa,,FALSE,,,,https://www.ingeniofm.com/,https://yt3.ggpht.com/8Mqa9VCxk9ijWdeq2Y7hfMn6953MyVo8IQ8qCVpbxRMTYMfC8REhe75PcDlF2ntsyldJFvJT=s400-c-k-c0x00ffffff-no-rj
 IngenioTV.mx,Ingenio TV,,,,MX,,,c/MX,spa,,FALSE,,,,https://aprende.gob.mx/,https://i.imgur.com/pAppH1M.png
 Ingushetia.ru,Ingushetia,Ингушетия,,,RU,,,c/RU,rus,,FALSE,,,,https://ingushetiya.tv/,https://i.imgur.com/Fw2Hkk4.png
+INH24x7.in,INH 24x7,,,,IN,,Raipur,c/IN,hin;hne,news,FALSE,,,,https://www.inhnews.in/livetv,https://i.imgur.com/Es3QiVx.png
 Inkavision.pe,Inkavision,Inkavisión,,,PE,PE-CUS,Cusco,c/PE,spa,,FALSE,,,,https://inkavision.pe/tv/,https://i.imgur.com/8d4PxCO.png
 InkMaster.us,Ink Master,,,,US,,,c/US,eng,documentary,FALSE,,,,https://pluto.tv/en/live-tv/ink-master,https://i.imgur.com/DiBojYh.png
 InnerMongoliaFootballTV.cn,Inner Mongolia Football TV,,,,CN,,,c/CN,mon,sports,FALSE,,,,,https://i.imgur.com/QgtxzMt.png
@@ -20752,6 +20748,7 @@ SLOSTV.nl,SLOS TV,,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/LREM7a6.png
 SlotstadTV.nl,Slotstad TV,,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/NXCUiuF.png
 SlowTV.us,Slow TV,,,,US,,,c/US,eng,,FALSE,,,,https://pluto.tv/en/live-tv/slow-tv,https://i.imgur.com/fWiud50.png
 SlowTVGermany.de,Slow TV Germany,,,,DE,,,c/DE,deu,documentary,FALSE,,,,https://pluto.tv/en/live-tv/slow-tv-de,https://i.imgur.com/a5ytvY3.png
+SLTV16.us,SLTV 16,,,,US,US-TX,Sugar Land,s/US-TX,eng,general,FALSE,,,,https://www.sugarlandtx.gov/297/SLTV-16,https://i.imgur.com/3pErwWR.png
 Sluhayby.by,Sluhay.by,,,,BY,,,c/BY,rus,music,FALSE,,,,,https://sluhay.by/assets/logo_channel.png
 SluhaybyAillion.by,Sluhay.by Aillion,,,,BY,,,c/BY,rus,music,FALSE,,,,,https://sluhay.by/assets/logo_channel.png
 SluhaybyAmongYourGod.by,Sluhay.by Among Your God,,,,BY,,,c/BY,rus,music,FALSE,,,,,https://sluhay.by/assets/logo_channel.png
@@ -22414,6 +22411,7 @@ Tempe11.us,Tempe 11,,,,US,US-AZ,,s/US-AZ,eng,,FALSE,,,,https://www.tempe.gov/com
 TempleTV.ng,Temple TV,,,,NG,,,c/NG,eng,,FALSE,,,,https://jctm.org/,https://i.imgur.com/qy9Mutu.png
 TempoNetworks.us,Tempo Networks,,,,US,,,c/US,eng,,FALSE,2005-11-21,,,http://gottempo.com/home,https://i.imgur.com/WAgAo68.png
 TempoTV.tr,Tempo TV,,,,TR,,,c/TR,tur,,FALSE,1990-01-03,2003-10-17,,http://www.tempo-tv.com/,https://i.imgur.com/6w3ecR7.png
+TEMTV.us,TEM TV,,,,US,US-TX,Temple,s/US-TX,eng,legislative,FALSE,,,,https://www.templetx.gov/services/watch/channel_10_-_tem_tv.php,https://i.imgur.com/aMIEXo2.png
 TemucoTelevision.cl,Temuco Television,Temuco Televisión,,,CL,CL-AR,Temuco,s/CL-AR,spa,,FALSE,,,,https://temucotelevision.cl/web/,https://i.imgur.com/8cFdw8R.png
 TeN.eg,TeN,,,,EG,,,c/EG,ara,,FALSE,,,,https://www.ten.tv/,https://i.imgur.com/gMnn6PD.png
 TEN.es,TEN,,,,ES,,,c/ES,spa,,FALSE,,,,https://tentv.es/,https://i.imgur.com/ZpaeqyN.png
@@ -22506,6 +22504,7 @@ TheCinema.jp,The Cinema,,,,JP,,,c/JP,jpn,movies,FALSE,,,,https://www.thecinema.j
 TheCinema4K.jp,The Cinema 4K,,,,JP,,,c/JP,jpn,movies,FALSE,,,,https://www.thecinema.jp/cinema4k/,https://i.imgur.com/xyTm8pi.png
 TheCityChannel.us,The City Channel,,,,US,US-CA,Cupertino,s/US-CA,eng,general,FALSE,,,,https://www.cupertino.org/our-city/videos-on-demand/city-channel-live-stream,https://i.imgur.com/fc70KO1.png
 TheCityofMarina.us,The City of Marina,,,,US,US-CA,Monterey,s/US-CA,eng;spa,legislative,FALSE,,,,https://accessmediaproductions.org/,https://i.imgur.com/ldyanxN.png
+TheColonyGovernmentAccess.us,The Colony Government Access,,,,US,US-TX,The Colony,s/US-TX,eng,general,FALSE,,,,https://www.thecolonytx.gov/604/Live-Video-Stream,https://i.imgur.com/RinoaRq.png
 TheCountryNetwork.us,The Country Network,,,,US,,,c/US,eng,music,FALSE,,,,,https://upload.wikimedia.org/wikipedia/en/d/dd/The_Country_Network_Logo.png
 TheCowboyChannel.us,The Cowboy Channel,,,Rural Media Group,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/0F1c7x4.png
 TheCraftistry.us,The Craftistry,,,,US,,,c/US,eng,lifestyle,FALSE,,,,,https://i.imgur.com/0hQoyYk.png
@@ -23162,6 +23161,7 @@ TV1000WorldKino.ru,TV1000 World Kino,,Viasat,,RU,,,c/RU,rus,movies,FALSE,,,,http
 TV100National.in,TV 100 National,,,,IN,,,c/IN,hin,,FALSE,,,,http://www.tv100.info/,https://i.imgur.com/3exXRsg.png
 TV10SanJuan.do,TV 10 San Juan,,,,DO,DO-22,,s/DO-22,spa,general,FALSE,,,,https://tv10sanjuan.com.do/,https://i.imgur.com/e2BXUdH.png
 TV12.se,TV 12,,,,SE,,,c/SE,swe,,FALSE,,,,https://www.tv4play.se/kanaler/tv12,https://images.ctfassets.net/989y85n5kcxs/4tUvpaEusfQBuod34WAMXF/77c650050ab68e72bfab5e7d6cebef49/tv12_200x200.png
+TV15.us,TV15,,,,US,US-TX,Victoria,s/US-TX,eng,legislative,FALSE,,,,https://www.victoriatx.gov/209/Watch-TV15,https://i.imgur.com/Um8Gg2D.png
 TV16Toronto.ca,TV 16 Toronto,,,,CA,,,c/CA,eng,,FALSE,,,,,https://i.imgur.com/c4lLchb.png
 TV1KG.kg,TV1.KG,,,,KG,,,c/KG,rus,,FALSE,,,,http://tv1.kg/,https://i.imgur.com/Mti9t9C.png
 TV1Oberosterreich.at,TV 1 Oberosterreich,TV 1 Oberösterreich,,,AT,,,c/AT,deu,,FALSE,,,,https://tv1.nachrichten.at/,https://i.imgur.com/KbMkEIn.png