diff --git a/data/channels.csv b/data/channels.csv
index 1cf535bc..9b0b7894 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -1367,6 +1367,7 @@ ArmNews.am,ArmNews,,,AM,,,c/AM,hye,news,FALSE,,,,,https://i.imgur.com/0vrFGY5.pn
 Arrabiaa.ma,Arrabiaa,,,MA,,,c/MA,ara;fra,general,FALSE,,,,,https://i.imgur.com/FvgdLdG.png
 ArRaudhahTV.id,Ar-Raudhah TV,,,ID,,Banjarmasin,s/ID-KS,ind,,FALSE,,,,http://arraudhah-sekumpul.com/,https://i.imgur.com/BhiIZ5R.jpg
 Arriadia.mr,Arriadia,,,MR,,,c/MR,ara,,FALSE,,,,,https://www.lyngsat.com/logo/tv/aa/arriadia-mr.png
+ArroyoGrandeChannel20.us,Arroyo Grande Channel 20,,,US,US-CA,Arroyo Grande,s/US-CA,eng,,FALSE,,,,https://slo-span.org/channels/arroyo-grande-channel-20,https://i.imgur.com/esyGcEK.png
 Arryadia.ma,Arryadia,,,MA,,,c/MA,ara,sports,FALSE,2006-09-16,,,https://arryadia.snrt.ma/,https://i.imgur.com/liFebM9.png
 Arsenal.ru,Arsenal,Арсенал,,RU,,,c/RU,rus,,FALSE,,,,https://arsenal-tv.tv/,https://i.imgur.com/uhrfA7Y.png
 ARTAflam1.sa,ART Aflam 1,,,SA,,,c/SA,ara,,FALSE,,,,https://www.artonline.tv/,https://i.imgur.com/MXSSdmX.png
@@ -15163,6 +15164,7 @@ MoreTVDrama.us,More TV Drama,,,US,,,c/US,eng,entertainment,FALSE,,,,https://plut
 MoreTVSitcoms.us,More TV Sitcoms,,,US,,,c/US,eng,comedy,FALSE,,,,https://pluto.tv/en/live-tv/more-tv-sitcoms,https://images.pluto.tv/channels/6132619f9ddaa50007e7dd86/colorLogoPNG.png
 MorningCloudTV.ke,Morning Cloud TV,,,KE,,,c/KE,eng,,FALSE,,,,,https://www.lyngsat.com/logo/tv/mm/morning-cloud-tv-ke.png
 MorphleUK.uk,Morphle UK,,,UK,,,c/UK,eng,kids,FALSE,,,,https://pluto.tv/en/live-tv/morphle-gb,https://images.pluto.tv/channels/60e44d0d659db600074cbb49/colorLogoPNG.png
+MorroBayChannel20.us,Morro Bay Channel 20,,,US,US-CA,Morro Bay,s/US-CA,eng,legislative,FALSE,,,,https://slo-span.org/channels/morro-bay-channel-20,https://i.imgur.com/UZeC6xH.png
 MorroTV.do,MorroTV,,,DO,,Montecristi,c/DO,spa,general,FALSE,,,,https://www.morrodigital.com/,https://www.morrodigital.com/wp-content/uploads/2022/02/cropped-photo_2022-02-10_09-46-23.jpg
 Morskoi.ru,Morskoi,,,RU,,,c/RU,rus,,FALSE,,,,http://www.morskoi.tv/,https://www.lyngsat.com/logo/tv/mm/morskoi_ru.png
 MosaiqueFM.tn,Mosaïque FM,,,TN,,,c/TN,ara,music,FALSE,,,,https://www.mosaiquefm.net/,https://i.imgur.com/35KJSUN.png
@@ -15702,6 +15704,8 @@ NancyWebTV.fr,Nancy Web TV,,,FR,,,c/FR,fra,,FALSE,,,,,https://i.imgur.com/W43rv1
 NandighoshaTV.in,Nandighosha TV,,,IN,,,c/IN,ori,,FALSE,,,,http://nandighoshatv.com/,https://i.imgur.com/olflwK9.png
 Nanduti.py,Nanduti,Ñanduti,,PY,,,c/PY,spa,,FALSE,,,,https://nanduti.com.py/nanduti-tv/,https://i.imgur.com/Qc7s5YE.png
 NanoTV.ru,Nano TV,,,RU,,,c/RU,rus,,FALSE,,,,https://tv-nano.ru/,https://avatars.mds.yandex.net/get-tv-channel-logos/70787/2a0000016d3a3be79b56e511f3a6f5d6124c/340x200
+NapaValleyChannel27.us,Napa Valley Channel 27,,,US,US-CA,Napa Valley,s/US-CA,eng,education,FALSE,,,,https://napatv.granicus.com/MediaPlayer.php?publish_id=2,https://i.imgur.com/gCquORk.png
+NapaValleyChannel28.us,Napa Valley Channel 28,,,US,US-CA,Napa Valley,s/US-CA,eng,general,FALSE,,,,https://napatv.granicus.com/MediaPlayer.php?publish_id=3,https://i.imgur.com/gCquORk.png
 NaranjaTV.do,Naranja TV,,,DO,,,c/DO,spa,,FALSE,,,,https://naranjatvrd.com/,https://naranjatvrd.com/wp-content/uploads/cropped-logo-de-naranja-tv-png-1-223x210.png
 Narcos.us,Narcos,,,US,,,c/US,spa,series,FALSE,,,,https://pluto.tv/en/live-tv/narcos,https://images.pluto.tv/channels/5f7274806621ff00072651ff/colorLogoPNG.png
 Narcosenespanol.us,Narcos en español,,,US,,,c/US,eng;spa,,FALSE,,,,https://pluto.tv/en/live-tv/narcos-en-espanol,https://images.pluto.tv/channels/5f7b47f12a45590007821749/colorLogoPNG.png
@@ -20557,10 +20561,6 @@ Slice.ca,Slice,,,CA,,,c/CA,eng,,FALSE,1995-01-01,,,http://www.slice.ca/,https://
 SliceHD.ca,Slice HD,,,CA,,,c/CA,eng,,FALSE,2013-05-29,,,http://www.slice.ca/,https://i.imgur.com/q5bYwJ7.png
 SlightlyOffIFC.us,Slightly Off IFC,,,US,,,c/US,eng,comedy,FALSE,,,,https://pluto.tv/en/live-tv/slightly-off-ifc,https://images.pluto.tv/channels/5e82547b6b3df60007fec2b5/colorLogoPNG.png
 SLOCountyChannel21.us,SLO County Channel 21,,,US,US-CA,Morro Bay,s/US-CA,eng,,FALSE,,,,https://slo-span.org/channels/slo-county-channel-21,https://i.imgur.com/CyQ472C.png
-MorroBayChannel20.us,Morro Bay Channel 20,,,US,US-CA,Morro Bay,s/US-CA,eng,legislative,FALSE,,,,https://slo-span.org/channels/morro-bay-channel-20,https://i.imgur.com/UZeC6xH.png
-ArroyoGrandeChannel20.us,Arroyo Grande Channel 20,,,US,US-CA,Arroyo Grande,s/US-CA,eng,,FALSE,,,,https://slo-span.org/channels/arroyo-grande-channel-20,https://i.imgur.com/esyGcEK.png
-NapaValleyChannel27.us,Napa Valley Channel 27,,,US,US-CA,Napa Valley,s/US-CA,eng,education,FALSE,,,,https://napatv.granicus.com/MediaPlayer.php?publish_id=2,https://i.imgur.com/gCquORk.png
-NapaValleyChannel28.us,Napa Valley Channel 28,,,US,US-CA,Napa Valley,s/US-CA,eng,general,FALSE,,,,https://napatv.granicus.com/MediaPlayer.php?publish_id=3,https://i.imgur.com/gCquORk.png
 SLOGOTV.nl,SLOGO TV,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/OoBPh4C.png
 Sloog.ma,Sloog,,,MA,,,c/MA,fra,,FALSE,,,,https://www.loterie.ma/presentation-sloog/,https://www.lyngsat.com/logo/tv/ss/sloog-ma.png
 SLOSTV.nl,SLOS TV,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/1CrhLCj.png