diff --git a/data/channels.csv b/data/channels.csv
index ef59218c..7b1ec3c9 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -4854,6 +4854,7 @@ CourtTVMystery.us,Court TV Mystery,,,US,,,c/US,eng,general,FALSE,,,,https://www.
 CourtTVUK.uk,Court TV UK,,,UK,,,c/UK,eng,,FALSE,,,,https://www.courttv.com/court-tv-uk/,https://d2n0069hmnqmmx.cloudfront.net/epgdata/1.0/newchanlogos/400/160/skychb1207.png
 CowboyChannel.us,Cowboy Channel,,,US,,,c/US,eng,,FALSE,,,,https://www.thecowboychannel.com/,https://www.lyngsat.com/logo/tv/cc/cowboy-channel-us.png
 CowboyChannelCanada.ca,Cowboy Channel Canada,,,CA,,,c/CA,eng,,FALSE,,,,https://thecowboychannelcanada.ca/,https://www.lyngsat.com/logo/tv/cc/cowboy-channel-canada-us-ca.png
+CoxEnfieldPublicAccess.us,Cox Enfield Public Access,,,US,US-CT,Enfield,s/US-CT,eng,general,FALSE,,,,http://184.177.41.241/CablecastPublicSite/watch/1?channel=1,https://i.imgur.com/5D7XE7u.png
 CoyoteRadio.us,Coyote Radio,,,US,US-CA,San Bernardino,s/US-CA,eng,music,FALSE,,,,https://www.csusb.edu/coyote-radio/watch-live,https://i.imgur.com/VoftOxv.png
 CozaTV.ng,Coza TV,,,NG,,,c/NG,eng,,FALSE,,,,https://coza.org.ng/,https://www.lyngsat.com/logo/tv/cc/coza-tv-ng.png
 CoziTV.us,Cozi TV,,,US,,,c/US,eng,,FALSE,2009-03-09,,,https://www.cozitv.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Cozi_TV_logo.svg/512px-Cozi_TV_logo.svg.png
@@ -6618,6 +6619,8 @@ FairchildTV1East.ca,Fairchild TV 1 East,,,CA,,,c/CA,zho;yue,,FALSE,,,,https://ww
 FairchildTV1West.ca,Fairchild TV 1 West,,,CA,,,c/CA,zho,,FALSE,,,,https://www.fairchildtv.com/,https://www.lyngsat.com/logo/tv/ff/fairchild-tv-1-ca.png
 FairchildTV2.ca,Fairchild TV 2,,,CA,,,c/CA,zho,,FALSE,,,,https://www.fairchildtv.com/,https://i.imgur.com/lxLSTrm.png
 FairfaxPublicAccess.us,Fairfax Public Access,,,US,,,c/US,eng,legislative,FALSE,,,,,https://www.fcac.org/sites/all/themes/fcac_base/images/logo-icon.png
+FairTVEducationChannel.us,FairTV Education Channel,,,US,US-CT,Fairfield,s/US-CT,eng,education,FALSE,,,,https://www.fairfieldct.org/fairtv/education,https://i.imgur.com/goDgZFo.png
+FairTVGovernment.us,FairTV Government,,,US,US-CT,Fairfield,s/US-CT,eng,legislative,FALSE,,,,https://www.fairfieldct.org/fairtv/government,https://i.imgur.com/cDNAqaQ.png
 FaithAfrica.za,Faith Africa,,,ZA,,,c/ZA,eng,,FALSE,,,,https://africa.myfaith.tv/,https://rndcdn.dstv.com/dstvcms/2018/03/23/faith_logo_4-3_lightbackground_xlrg.png
 FaithLifeTV.us,Faith & Life TV,,,US,,,c/US,eng,religious,FALSE,,,,,https://pbs.twimg.com/profile_images/1131290789/fnlLogo_400x400.png
 FaithTV.ca,FaithTV,,,CA,,,c/CA,eng,,FALSE,,,,,https://cdn.tvpassport.com/image/station/100x100/faithtv.png
@@ -8192,6 +8195,9 @@ HOTTV.pt,HOT TV,,,PT,,,c/PT,por,xxx,TRUE,,,,http://www.hottv.pt/,https://i.imgur
 HoungFaTV.vn,Houng Fa TV,,,VN,,,c/VN,vie,,FALSE,,,,,https://i.imgur.com/i4CbDrR.png
 HouseholdManagementTV.cn,Household Management TV,,,CN,,,c/CN,zho,,FALSE,,,,,https://www.lyngsat.com/logo/tv/hh/household-management-tv-cn.png
 Hoynet.pe,Hoynet,,,PE,,,c/PE,spa,,FALSE,,,,,https://i.imgur.com/gAQaSBj.png
+HPATVEducationalChannel95.us,HPATV Educational Channel 95,,,US,US-CT,Hartford,s/US-CT,eng,education,FALSE,,,,https://hpatv.org/,https://i.imgur.com/CojLK5E.png
+HPATVGovernmentChannel96.us,HPATV Government Channel 96,,,US,US-CT,Hartford,s/US-CT,eng,legislative,FALSE,,,,https://hpatv.org/,https://i.imgur.com/CojLK5E.png
+HPATVPublicChannel5.us,HPATV Public Channel 5,,,US,US-CT,Hartford,s/US-CT,eng,general,FALSE,,,,https://hpatv.org/,https://i.imgur.com/CojLK5E.png
 HPItv.ca,HPItv,,,CA,,,c/CA,eng,,FALSE,2001-09-01,,,https://www.hpibet.com/,https://upload.wikimedia.org/wikipedia/en/b/b4/HPI_TV_2015.png
 HPItvCanada.ca,HPItv Canada,,,CA,,,c/CA,eng,,FALSE,2001-09-01,,,https://www.hpibet.com/,https://upload.wikimedia.org/wikipedia/en/b/b4/HPI_TV_2015.png
 HPItvInternational.ca,HPItv International,,,CA,,,c/CA,eng,,FALSE,2001-09-01,,,https://www.hpibet.com/,https://upload.wikimedia.org/wikipedia/en/b/b4/HPI_TV_2015.png
@@ -24960,12 +24966,6 @@ VranjskaPlus.rs,Vranjska Plus,,,RS,,,c/RS,srp,,FALSE,,,,,https://mts.rs/oec/imag
 Vremya.ru,Vremya,Время,,RU,,,c/RU,rus,,FALSE,,,,https://www.vremya.tv/,https://i.imgur.com/jZlj3ga.png
 VrindaTV.in,Vrinda TV,,,IN,,,c/IN,hin,,FALSE,,,,,https://i.imgur.com/BIxYQpl.png
 VSCTV.us,VSCTV,,,US,US-CT,Clinton,s/US-CT,eng,general,FALSE,,,,https://reflect-vsctv.cablecast.tv/CablecastPublicSite/watch/1?channel=1,https://i.imgur.com/GmPJCr3.jpg
-CoxEnfieldPublicAccess.us,Cox Enfield Public Access,,,US,US-CT,Enfield,s/US-CT,eng,general,FALSE,,,,http://184.177.41.241/CablecastPublicSite/watch/1?channel=1,https://i.imgur.com/5D7XE7u.png
-FairTVEducationChannel.us,FairTV Education Channel,,,US,US-CT,Fairfield,s/US-CT,eng,education,FALSE,,,,https://www.fairfieldct.org/fairtv/education,https://i.imgur.com/goDgZFo.png
-FairTVGovernment.us,FairTV Government,,,US,US-CT,Fairfield,s/US-CT,eng,legislative,FALSE,,,,https://www.fairfieldct.org/fairtv/government,https://i.imgur.com/cDNAqaQ.png
-HPATVPublicChannel5.us,HPATV Public Channel 5,,,US,US-CT,Hartford,s/US-CT,eng,general,FALSE,,,,https://hpatv.org/,https://i.imgur.com/CojLK5E.png
-HPATVEducationalChannel95.us,HPATV Educational Channel 95,,,US,US-CT,Hartford,s/US-CT,eng,education,FALSE,,,,https://hpatv.org/,https://i.imgur.com/CojLK5E.png
-HPATVGovernmentChannel96.us,HPATV Government Channel 96,,,US,US-CT,Hartford,s/US-CT,eng,legislative,FALSE,,,,https://hpatv.org/,https://i.imgur.com/CojLK5E.png
 VSeries.se,V Series,,,SE,,,c/SE,swe;nor;dan;fin,series,FALSE,,,,,https://i.imgur.com/H8Kt5Ax.png
 VSHNews.pk,VSH News,,,PK,,,c/PK,eng,news,FALSE,2009-01-01,,,https://vshnews.tv/,https://i.imgur.com/SGwtVNz.png
 VSiN.us,VSiN,,,US,,,c/US,eng,,FALSE,,,,https://www.vsin.com/livestream/,https://i.imgur.com/C4wIRxg.png