diff --git a/channels/es.m3u b/channels/es.m3u
index ae2d9ede0..c15e6c62d 100644
--- a/channels/es.m3u
+++ b/channels/es.m3u
@@ -2,7 +2,7 @@
 
 #EXTINF:-1 tvg-id="24Horas.TV" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/SvUWRQm.png" group-title="News",24 Horas
 https://hlsliveamdgl8-lh.akamaihd.net/i/hlsdvrlive_1@583030/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan, Valencian" tvg-logo="https://i.imgur.com/CnIVW9o.jpg" group-title="News",324
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan" tvg-logo="https://i.imgur.com/CnIVW9o.jpg" group-title="News",324
 https://directes-tv-int.ccma.cat/int/ngrp:324_web/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/M0JqHa9.png" group-title="Local",7 Murcia
 https://rtvmurcia_01-lh.akamaihd.net/i/rtvmurcia_1_0@507973/master.m3u8
@@ -16,7 +16,7 @@ https://cartv.streaming.aranova.es/hls/live/aragontv_canal1.m3u8
 https://pastebin.com/raw/jf3NxqPs
 #EXTINF:-1 tvg-id="Boing" tvg-name="" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e0/Boing.svg/240px-Boing.svg.png" group-title="",Boing
 https://pastebin.com/raw/afgk7wAC
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan, Valencian" tvg-logo="https://i.imgur.com/pY8zxN3.png" group-title="",Bon Dia TV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan" tvg-logo="https://i.imgur.com/pY8zxN3.png" group-title="",Bon Dia TV
 https://directes-tv-int.ccma.cat/int/ngrp:bnd_web/chunklist.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/AFT43kx.png" group-title="",Cadena Elite
 https://5b38ce71f1f00.streamlock.net/8066/8066/master.m3u8
@@ -92,7 +92,7 @@ https://rmtvlive-lh.akamaihd.net/i/rmtv_1@154306/master.m3u8
 https://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hweben_1@300662/master.m3u8
 #EXTINF:-1 tvg-id="Real Madrid TV ES" tvg-name="Real Madrid TV ES" tvg-language="Spanish" tvg-logo="https://i.imgur.com/2M9WfqA.jpg" group-title="Sport",Real Madrid TV
 https://rmtv24hweblive-lh.akamaihd.net/i/rmtv24hwebes_1@300661/master.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan, Valencian" tvg-logo="https://i.imgur.com/o8EtLad.png" group-title="",RiberaTV
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan" tvg-logo="https://i.imgur.com/o8EtLad.png" group-title="Local",RiberaTV
 https://common01.todostreaming.es/live/ribera-livestream.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/j73rLdT.png" group-title="",RTPA Asturias
 https://cdnlive.shooowit.net/rtpalive/smil:directo.smil/playlist.m3u8
@@ -108,9 +108,9 @@ http://93.93.67.117:1935/taroteame/tarot_web/playlist.m3u8
 https://cdn01.yowi.tv/BBBBBBBBBB/master.m3u8
 #EXTINF:-1 tvg-id="Telecinco" tvg-name="" tvg-language="Spanish" tvg-logo="https://upload.wikimedia.org/wikipedia/commons/thumb/f/fc/Telecinco.svg/246px-Telecinco.svg.png" group-title="",Telecinco
 https://pastebin.com/raw/455ygZ6Y
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan, Valencian" tvg-logo="https://i.imgur.com/UJrapXK.jpg" group-title="Local",TeleSafor
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan" tvg-logo="https://i.imgur.com/UJrapXK.jpg" group-title="Local",TeleSafor
 https://video.telesafor.com/hls/video.m3u8
-#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan, Valencian" tvg-logo="https://i.imgur.com/khRXhT1.png" group-title="",Televisio Girona
+#EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Catalan" tvg-logo="https://i.imgur.com/khRXhT1.png" group-title="Local",Televisio Girona
 http://ventdelnord.tv:8080/girona/directe.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Galician" tvg-logo="https://i.imgur.com/1Z6svKc.jpg" group-title="General",Televisión de Galicia América
 https://america-crtvg.flumotion.com/playlist.m3u8
@@ -124,9 +124,9 @@ https://wowzaprod256-i.akamaihd.net/hls/live/779970/7e9bac89/playlist.m3u8
 https://streaming.enetres.net/091DB7AFBD77442B9BA2F141DCC182F5021/live.smil/master.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Spanish" tvg-logo="https://i.imgur.com/HAbq91X.png" group-title="",TV Municipal Cordoba
 http://teledifusion.tv:1935/cordoba/cordobalive/.m3u8
-#EXTINF:-1 tvg-id="TV3.TV" tvg-name="" tvg-language="Catalan, Valencian" tvg-logo="https://i.imgur.com/QCKNWMJ.jpg" group-title="",TV3 Catalunya
+#EXTINF:-1 tvg-id="TV3.TV" tvg-name="" tvg-language="Catalan" tvg-logo="https://i.imgur.com/QCKNWMJ.jpg" group-title="",TV3 Catalunya
 https://directes-tv-int.ccma.cat/int/ngrp:tvi_web/chunklist.m3u8
-#EXTINF:-1 tvg-id="APUNT.TV" tvg-name="" tvg-language="Catalan, Valencian" tvg-logo="https://graph.facebook.com/apuntmedia/picture?width=200&height=200" group-title="General",À Punt
+#EXTINF:-1 tvg-id="APUNT.TV" tvg-name="" tvg-language="Catalan" tvg-logo="https://graph.facebook.com/apuntmedia/picture?width=200&height=200" group-title="General",À Punt
 https://bcovlive-a.akamaihd.net/1e7e91116b104391a4f22e13a694d94f/eu-central-1/6057955885001/playlist_dvr.m3u8
 #EXTINF:-1 tvg-id="" tvg-name="" tvg-language="Galician" tvg-logo="https://i.imgur.com/YAnSTc6.jpg" group-title="Local",TVG 2
 https://events2-crtvg.flumotion.com/playlist.m3u8