diff --git a/data/channels.csv b/data/channels.csv
index a3d862af..23cb3756 100644
--- a/data/channels.csv
+++ b/data/channels.csv
@@ -6562,7 +6562,7 @@ DigiAnimalWorld.hu,Digi Animal World,,,RCS & RDS,HU,,Bucharest,outdoor,FALSE,201
 DigiAnimalWorld.ro,Digi Animal World,,,RCS & RDS,RO,,Bucharest,outdoor,FALSE,2012-12-06,,,https://www.digi-animalworld.tv/,https://i.imgur.com/LUvGjAz.png
 DigiLife.hu,Digi Life,,,RCS & RDS,HU,,Bucharest,,FALSE,2012-11-07,2022-09-01,,https://www.digilife.hu/,https://i.imgur.com/YhKpUkd.png
 DigiLife.ro,Digi Life,,,RCS & RDS,RO,,Bucharest,,FALSE,2012-10-01,,,https://www.digi-life.tv/,https://i.imgur.com/YhKpUkd.png
-DigiOne.id,DigiOne,,,RCS & RDS,ID,,,,FALSE,,,,https://maxstream.tv,https://i.imgur.com/TISRYvq.png
+DigiOne.id,DigiOne,,,RCS & RDS,ID,,,entertainment,FALSE,,,,https://maxstream.tv,https://i.imgur.com/TISRYvq.png
 DigiShala.in,Digi Shala,,,DD Free Dish,IN,,Delhi,education,FALSE,,,,http://cashlessindia.gov.in/digishala-educational-tv-channel-for-digital-payments-on-dd-free-dish.html,https://i.imgur.com/FrLsl10.png
 DigiSport1.hu,Digi Sport 1,,,RCS & RDS,HU,,Bucharest,sports,FALSE,2012-08-01,2022-08-05,,http://digisport.hu/,https://i.imgur.com/5zMxDYq.png
 DigiSport1.ro,Digi Sport 1,,,RCS & RDS,RO,,Bucharest,sports,FALSE,2012-08-11,,,http://digisport.ro/,https://i.imgur.com/5zMxDYq.png
@@ -9141,6 +9141,7 @@ GongyoungHomeShopping.kr,Gongyoung Home Shopping,공영홈쇼핑;Public Home Sho
 GoobjoogTV.so,Goobjoog TV,,,Goobjoog Media Group,SO,,Mogadishu,news,FALSE,,,,https://goobjoog.com/,https://i.imgur.com/g0oG6f7.jpg
 GOOD.au,GOOD.,ACCTV;Australian Christian Channel,,Australian Christian Channel,AU,,Buderim,religious,FALSE,1999-04-04,,,https://watchgood.com/,https://i.imgur.com/uLmrGJk.png
 Good2.tw,Good 2,好消息電視台,,,TW,,New Taipei,religious,FALSE,2009-07-31,,,https://www.goodtv.tv/,https://i.imgur.com/YxFRoft.png
+GooderNationChannel32.us,Gooder Nation Channel 32,,,,US,US-OR,Coos Bay,general;animation,FALSE,,,,,https://i.imgur.com/7bHiavg.png
 GoodIdeaTV.th,Good Idea TV,,,,TH,,Mueang Chiang Mai,entertainment,FALSE,,,,http://www.goodideatv.tv/,https://i.imgur.com/ETgVyTy.png
 GoodLife.il,Good Life,,,,IL,,Tel Aviv,lifestyle,FALSE,,,,https://xnet.ynet.co.il/home/0,https://i.imgur.com/BFcTNXQ.png
 GoodLife45.us,GoodLife 45,,,,US,US-FL,Lake Mary,religious,FALSE,,,,https://www.tv45.org/contactus,https://i.imgur.com/AQfVNMK.png
diff --git a/data/feeds.csv b/data/feeds.csv
index 2f0bf626..144ced16 100644
--- a/data/feeds.csv
+++ b/data/feeds.csv
@@ -1324,8 +1324,8 @@ AlphaChannel.sr,SD,SD,TRUE,c/SR,America/Paramaribo,nld;eng,480i
 AlphaDigital.ug,SD,SD,TRUE,c/UG,Africa/Kampala,eng,576i
 AlphaetOmegaTV.ci,SD,SD,TRUE,c/CI,Africa/Abidjan,fra,576i
 AlphaSat.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
-AlphaTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 AlphaTV.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+AlphaTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 AlphaTVCyprus.cy,SD,SD,TRUE,c/CY,Asia/Nicosia,ell,576i
 AlpoTV.al,SD,SD,TRUE,c/AL,Europe/Tirane,sqi,576i
 AlQaheraNews.eg,SD,SD,TRUE,c/EG,Africa/Cairo,ara,576i
@@ -1687,8 +1687,8 @@ ANPITV.uy,SD,SD,TRUE,c/UY,America/La_Paz,spa,576i
 AnshunComprehensiveNewsChannel.cn,SD,SD,TRUE,c/CN,Asia/Shanghai,zho,576i
 AnshunPublicChannel.cn,SD,SD,TRUE,c/CN,Asia/Shanghai,zho,576i
 Ant.vn,SD,SD,TRUE,c/VN,Asia/Ho_Chi_Minh,vie,576i
-ANT1.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ANT1.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+ANT1.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ANT1Cyprus.cy,SD,SD,TRUE,c/CY,Europe/Athens,ell,576i
 ANT1Europe.gr,SD,SD,TRUE,r/EUR,Europe/Athens,ell,576i
 ANT1Pacific.gr,SD,SD,TRUE,r/OCE,Europe/Athens,ell,576i
@@ -8459,19 +8459,19 @@ EroX.nl,HD,HD,FALSE,r/INT,Europe/Amsterdam,eng,1080i
 EroX.nl,SD,SD,TRUE,r/INT,Europe/Amsterdam,eng,576i
 EroXXX.nl,HD,HD,FALSE,r/INT,Europe/Amsterdam,eng,1080i
 EroXXX.nl,SD,SD,TRUE,r/INT,Europe/Amsterdam,eng,576i
-ERT1.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ERT1.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
-ERT2.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
+ERT1.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ERT2.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
-ERT3.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
+ERT2.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ERT3.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+ERT3.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ERTChristmas.gr,HD,HD,TRUE,c/GR,Europe/Athens,ell,1080i
 ERTEurovisionChannel.gr,HD,HD,TRUE,c/GR,Europe/Athens,ell,1080i
 Ertis.kz,SD,SD,TRUE,c/KZ,Asia/Almaty,kaz,576i
 ERTKids.gr,HD,HD,TRUE,c/GR,Europe/Athens,ell,1080i
 ERTMusic.gr,HD,HD,TRUE,c/GR,Europe/Athens,ell,1080i
-ERTNews.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ERTNews.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+ERTNews.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 ERTNews2.gr,HD,HD,TRUE,c/GR,Europe/Athens,ell,1080i
 ErtSahTV.tr,SD,SD,TRUE,c/TR,Europe/Istanbul,tur,576i
 ERTSports.gr,HD,HD,TRUE,c/GR,Europe/Athens,ell,1080i
@@ -8490,8 +8490,8 @@ ERTU8Teba.eg,SD,SD,TRUE,c/EG,Africa/Cairo,ara,576i
 ERTV.tr,SD,SD,TRUE,c/TR,Europe/Istanbul,tur,576i
 ErTVChannel180.us,SD,SD,TRUE,s/US-MN,America/New_York,eng,480i
 ERTWorld.ca,SD,SD,TRUE,c/CA,America/Toronto,ell,480i
-ERTWorld.gr,SD,SD,TRUE,r/INT,Europe/Athens,ell,576i
 ERTWorld.gr,HD,HD,FALSE,r/INT,Europe/Athens,ell,1080i
+ERTWorld.gr,SD,SD,TRUE,r/INT,Europe/Athens,ell,576i
 EryalTV.uk,SD,SD,TRUE,c/UK;c/SO,America/Toronto,som,576i
 ErzTVStollberg.de,SD,SD,TRUE,c/DE,Europe/Berlin,deu,576i
 ErzurumWebTV.tr,SD,SD,TRUE,c/TR,Europe/Istanbul,tur,576i
@@ -10220,6 +10220,7 @@ GongyoungHomeShopping.kr,SD,SD,TRUE,c/KR,Asia/Seoul,kor,480i
 GoobjoogTV.so,SD,SD,TRUE,c/SO,Africa/Mogadishu,som,576i
 GOOD.au,SD,SD,TRUE,c/AU,Australia/Sydney,eng,576i
 Good2.tw,SD,SD,TRUE,c/TW,Asia/Taipei,zho,480i
+GooderNationChannel32.us,West,West,TRUE,s/US-OR,America/Los_Angeles,eng,720p
 GoodIdeaTV.th,SD,SD,TRUE,c/TH,Asia/Bangkok,tha,576i
 GoodLife.il,SD,SD,TRUE,c/IL,Asia/Jerusalem,heb,576i
 GoodLife45.us,SD,SD,TRUE,c/US,America/New_York,eng,480i
@@ -15885,8 +15886,8 @@ KonkurentTV.ua,SD,SD,TRUE,c/UA,Europe/Kyiv,ukr,576i
 Konniymir.ru,HD,HD,FALSE,c/RU,Europe/Moscow,rus,1080i
 Konniymir.ru,SD,SD,TRUE,c/RU,Europe/Moscow,rus,576i
 KontaktTV.nl,SD,SD,TRUE,c/NL,Europe/Amsterdam,nld,576i
-KontraChannel.gr,SD,SD,TRUE,c/GR;s/GR-I,Europe/Athens,ell,576i
 KontraChannel.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+KontraChannel.gr,SD,SD,TRUE,c/GR;s/GR-I,Europe/Athens,ell,576i
 KonTumTV.vn,SD,SD,TRUE,c/VN,Asia/Ho_Chi_Minh,vie,576i
 KonTV.tr,SD,SD,TRUE,c/TR,Europe/Istanbul,tur,576i
 KonyaOlayTV.tr,SD,SD,TRUE,c/TR,Europe/Istanbul,tur,576i
@@ -19166,8 +19167,8 @@ MajorChannelMix.th,SD,SD,TRUE,c/TH,Asia/Bangkok,tha,576i
 MakaluTV.np,SD,SD,TRUE,c/NP,Asia/Kathmandu,nep,576i
 Makan33.il,SD,SD,TRUE,c/IL,Asia/Jerusalem,ara,576i
 MakaoTV.do,SD,SD,TRUE,c/DO,America/Santo_Domingo,spa,480i
-MakedoniaTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 MakedoniaTV.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+MakedoniaTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 MakedonskoSonce.mk,SD,SD,TRUE,c/MK,Europe/Skopje,mkd,576i
 Makeful.ca,SD,SD,TRUE,c/CA,America/Toronto,eng,480i
 MakkahLive.bd,SD,SD,TRUE,c/BD,Asia/Dhaka,ben,576i
@@ -19565,8 +19566,8 @@ Mega.ua,SD,SD,TRUE,c/UA,Europe/Kyiv,ukr,576i
 Mega24.in,SD,SD,TRUE,c/IN,Asia/Kolkata,tam,576i
 MegaBox.ni,SD,SD,TRUE,c/NI,America/Managua,spa,480i
 Megacanal.mx,SD,SD,TRUE,c/MX,America/Mexico_City,spa,480i
-MegaChannel.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 MegaChannel.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+MegaChannel.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 MegaChapines.gt,SD,SD,TRUE,c/GT,America/Argentina/Cordoba,spa,480i
 MegafonTV.si,SD,SD,TRUE,c/SI,Europe/Ljubljana,slv,576i
 MegahitsTV.cr,SD,SD,TRUE,c/CR,America/La_Paz,spa,480i
@@ -21513,8 +21514,8 @@ Nickelodeon.dk,SD,SD,TRUE,c/DK;c/GL,Europe/Copenhagen,dan,576i
 Nickelodeon.es,SD,SD,TRUE,c/ES;c/PT;c/AD;c/AO;c/MZ;c/CV;c/GQ,Europe/Madrid,spa;por;eng,576i
 Nickelodeon.fr,Plus1,+1,FALSE,c/FR,Europe/Paris,fra,576i
 Nickelodeon.fr,SD,SD,TRUE,c/FR,Europe/Paris,fra,576i
-Nickelodeon.gr,SD,SD,TRUE,c/GR;c/CY;s/GR-I,Europe/Athens,ell;eng,576i
 Nickelodeon.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell;eng,1080i
+Nickelodeon.gr,SD,SD,TRUE,c/GR;c/CY;s/GR-I,Europe/Athens,ell;eng,576i
 Nickelodeon.hr,SD,SD,TRUE,c/HR,America/Toronto,hrv,576i
 Nickelodeon.hu,SD,SD,TRUE,c/HU,America/Toronto,hun,576i
 Nickelodeon.ie,SD,SD,TRUE,c/IE,Europe/Dublin,eng,576i
@@ -22489,8 +22490,8 @@ OpenShop.au,SD,SD,TRUE,c/AU,Australia/Sydney,eng,576i
 OpenStageMediaArtsandMedia.us,SD,SD,TRUE,s/US-NY,America/New_York,eng,480i
 OpenStageMediaGovernment.us,SD,SD,TRUE,s/US-NY,America/New_York,eng,480i
 OpenStageMediaPublicAccess.us,SD,SD,TRUE,s/US-NY,America/New_York,eng,480i
-OpenTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 OpenTV.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+OpenTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 OpiniaoPlayTV.br,SD,SD,TRUE,s/BR-SP,America/Sao_Paulo,por,480i
 Opinionsur.cl,SD,SD,TRUE,c/CL,America/Santiago,spa,480i
 OplotTV.ru,SD,SD,TRUE,c/RU,Europe/Kyiv,rus,576i
@@ -26860,8 +26861,8 @@ Sjuan.se,SD,SD,TRUE,c/SE,Europe/Stockholm,swe,576i
 SK1.ua,SD,SD,TRUE,c/UA,Europe/Kyiv,ukr,576i
 SK2TV.sn,SD,SD,TRUE,c/SN,Africa/Dakar,fra,576i
 Skagit21Television.us,SD,SD,TRUE,s/US-WA,America/New_York,eng,480i
-SkaiTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 SkaiTV.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+SkaiTV.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 SKARTV.gy,SD,SD,TRUE,c/GY,Atlantic/St_Helena,eng,480i
 SKAT.bg,SD,SD,TRUE,c/BG,Europe/Sofia,bul,576i
 Skazkizayki.ru,SD,SD,TRUE,c/RU,Europe/Moscow,rus,576i
@@ -27433,8 +27434,8 @@ SMGFootballChannel.cn,SD,SD,TRUE,c/CN,Asia/Shanghai,zho,576i
 Smile.al,SD,SD,TRUE,c/AL,Europe/Tirane,sqi,576i
 Smile.us,SD,SD,TRUE,c/US,America/New_York,eng,480i
 SmilePlus.gr,SD,SD,TRUE,c/GR;s/GR-E,Europe/Athens,ell,576i
-SmileTV.gr,SD,SD,TRUE,c/GR;s/GR-I,Europe/Athens,ell,576i
 SmileTV.gr,Panhellenic,Panhellenic,FALSE,c/GR,Europe/Athens,ell,576i
+SmileTV.gr,SD,SD,TRUE,c/GR;s/GR-I,Europe/Athens,ell,576i
 SmileTV.pk,SD,SD,TRUE,c/PK,Asia/Karachi,eng,576i
 SmileTV.us,SD,SD,TRUE,c/US,America/New_York,eng,480i
 SmileTVCyprus.cy,SD,SD,TRUE,c/CY,Asia/Nicosia,ell,576i
@@ -27953,8 +27954,8 @@ StarChannel.br,SD,SD,TRUE,c/BR,America/Sao_Paulo,por;eng,480i
 StarChannel.cl,SD,SD,TRUE,c/CL,America/Santiago,spa,480i
 StarChannel.co,SD,SD,TRUE,c/CO,America/Bogota,spa,480i
 STARChannel.fi,SD,SD,TRUE,c/FI,Europe/Helsinki,fin,576i
-StarChannel.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 StarChannel.gr,HD,HD,FALSE,c/GR,Europe/Athens,ell,1080i
+StarChannel.gr,SD,SD,TRUE,c/GR,Europe/Athens,ell,576i
 StarChannel.jp,SD,SD,TRUE,c/JP,Asia/Tokyo,jpn,480i
 StarChannel.mx,SD,SD,TRUE,c/MX,America/Mexico_City,spa;eng,480i
 StarChannel.nl,HD,HD,FALSE,c/NL,Europe/Amsterdam,nld,1080i
@@ -39672,4 +39673,4 @@ ZvezdaTV.rs,SD,SD,TRUE,c/RS,Europe/Belgrade,srp,576i
 ZVTAVS.nl,SD,SD,TRUE,c/NL,Europe/Amsterdam,nld,576i
 Zvyazda.by,SD,SD,TRUE,c/BY,Europe/Minsk,bel;rus,576i
 ZweiMusicTelevision.de,SD,SD,TRUE,c/DE,Europe/Berlin,deu,576i
-ZZTV.rs,SD,SD,TRUE,c/RS,Europe/Belgrade,eng,576i
+ZZTV.rs,SD,SD,TRUE,c/RS,Europe/Belgrade,eng,576i
\ No newline at end of file