diff --git a/data/initial/services.xml b/data/initial/services.xml
index 444009d32..bd331aa22 100644
--- a/data/initial/services.xml
+++ b/data/initial/services.xml
@@ -2,7 +2,7 @@
 <zapit api="4">
 	<sat name="Astra 1KR/1L/1M/1N (19.2E)" flags="0" position="192">
 		<TS id="03e9" on="0001" frq="11214000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
-			<S i="3459" n="Service 13401" t="1" s="0" num="0" f="0"/>
+			<S i="3459" n="Service 13401" t="1f" s="0" num="0" f="0"/>
 			<S i="345d" n="Service13405" t="1" s="0" num="0" f="0"/>
 			<S i="3462" n="RTL UHD Austria" t="1f" s="0" num="0" f="0"/>
 			<S i="3464" n="Service 13412" t="1" s="0" num="0" f="0"/>
@@ -34,6 +34,8 @@
 			<S i="78b6" n="M.Seriesmania HD" t="19" s="0" num="0" f="0"/>
 			<S i="78b7" n="M. GOLF HD" t="19" s="0" num="0" f="0"/>
 			<S i="78b8" n="COSMO HD" t="19" s="0" num="0" f="0"/>
+			<S i="78b9" n="11258V SID 0x78b9" t="1" s="0" num="0" f="0"/>
+			<S i="78be" n="11258V SID 0x78be" t="1" s="0" num="0" f="0"/>
 			<S i="78c0" n="COMEDYCENTRALHD" t="19" s="0" num="0" f="0"/>
 			<S i="78c2" n="11258V SID 0x78c2" t="64" s="0" num="0" f="0"/>
 		</TS>
@@ -59,6 +61,7 @@
 			<S i="1078" n="RAI News 24" t="1" s="0" num="0" f="0"/>
 			<S i="1081" n="Deutschland Vozrozhdenie" t="16" s="0" num="0" f="0"/>
 			<S i="1086" n="QVC UHD" t="1f" s="0" num="0" f="0"/>
+			<S i="1090" n="D7 TV" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="03ef" on="0001" frq="11302000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="132f" n="ORF1 HD" t="19" s="0" num="0" f="0"/>
@@ -77,6 +80,9 @@
 			<S i="746e" n="M. DRAMA" t="1" s="0" num="0" f="0"/>
 			<S i="746f" n="FOX" t="1" s="0" num="0" f="0"/>
 			<S i="7471" n="AXN WHITE" t="1" s="0" num="0" f="0"/>
+			<S i="7472" n="11317V SID 0x7472" t="1" s="0" num="0" f="0"/>
+			<S i="7473" n="11317V SID 0x7473" t="1" s="0" num="0" f="0"/>
+			<S i="7474" n="11317V SID 0x7474" t="1" s="0" num="0" f="0"/>
 			<S i="7476" n="11317V SID 0x7476" t="64" s="0" num="0" f="0"/>
 			<S i="7477" n="AXN" t="1" s="0" num="0" f="0"/>
 			<S i="7478" n="#0" t="1" s="0" num="0" f="0"/>
@@ -125,9 +131,6 @@
 			<S i="126e" n=".1." t="1" s="1" num="0" f="0"/>
 			<S i="126f" n=".2." t="1" s="1" num="0" f="0"/>
 			<S i="1270" n=".3." t="1" s="1" num="0" f="0"/>
-			<S i="127a" n="11420H SID 0x127a" t="64" s="0" num="0" f="0"/>
-			<S i="127b" n="11420H SID 0x127b" t="64" s="0" num="0" f="0"/>
-			<S i="127c" n="11420H SID 0x127c" t="64" s="0" num="0" f="0"/>
 			<S i="12b5" n="11420H SID 0x12b5" t="64" s="0" num="0" f="0"/>
 			<S i="12b6" n="11420H SID 0x12b6" t="64" s="0" num="0" f="0"/>
 			<S i="12b7" n="11420H SID 0x12b7" t="64" s="0" num="0" f="0"/>
@@ -171,19 +174,6 @@
 			<S i="1b61" n="Al Jazeera Channel" t="1" s="0" num="0" f="0"/>
 			<S i="1b63" n="Arirang TV" t="1" s="0" num="0" f="0"/>
 		</TS>
-		<TS id="03fd" on="0001" frq="11523000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
-			<S i="11f8" n="a.tv" t="1" s="0" num="0" f="0"/>
-			<S i="11f9" n="Franken Fernsehen" t="1" s="0" num="0" f="0"/>
-			<S i="11fa" n="intv" t="1" s="0" num="0" f="0"/>
-			<S i="11fb" n="Ulm-Allgäu" t="1" s="0" num="0" f="0"/>
-			<S i="11fc" n="münchen.tv" t="1" s="0" num="0" f="0"/>
-			<S i="11fd" n="rfo Regional Oberbayern" t="1" s="0" num="0" f="0"/>
-			<S i="11fe" n="Mainfranken" t="1" s="0" num="0" f="0"/>
-			<S i="11ff" n="TV Oberfranken" t="1" s="0" num="0" f="0"/>
-			<S i="1200" n="TVA-OTV" t="1" s="0" num="0" f="0"/>
-			<S i="1201" n="Niederbayern" t="1" s="0" num="0" f="0"/>
-			<S i="1252" n="Lokal TV Portal" t="1" s="0" num="0" f="0"/>
-		</TS>
 		<TS id="03fe" on="0001" frq="11538000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="1af4" n="DATASYSTEM" t="c" s="0" num="0" f="0"/>
 			<S i="1af8" n="Russia Today" t="1" s="0" num="0" f="0"/>
@@ -224,6 +214,7 @@
 		</TS>
 		<TS id="0403" on="0001" frq="11611000" inv="2" sr="22000000" fec="5" pol="0" mod="0" sys="0">
 			<S i="13fc" n="TSR Turkce" t="2" s="0" num="0" f="0"/>
+			<S i="1406" n="Kaufbei.tv" t="16" s="0" num="0" f="0"/>
 			<S i="140a" n="YOL TV" t="1" s="0" num="0" f="0"/>
 			<S i="1417" n="TBN Russia" t="1" s="0" num="0" f="0"/>
 			<S i="1419" n="Juvelirochka" t="1" s="0" num="0" f="0"/>
@@ -246,9 +237,9 @@
 		</TS>
 		<TS id="0406" on="0001" frq="11656000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
 			<S i="1194" n="SPORTDIGITAL FUSSBALL HD" t="19" s="1" num="0" f="0"/>
-			<S i="1195" n="Sport1+ HD" t="19" s="1" num="0" f="0"/>
-			<S i="1196" n="ESport1 HD" t="19" s="1" num="0" f="0"/>
-			<S i="1197" n="." t="19" s="1" num="0" f="0"/>
+			<S i="1195" n="SPORT1+" t="19" s="1" num="0" f="0"/>
+			<S i="1196" n="eSPORTS1" t="19" s="1" num="0" f="0"/>
+			<S i="1197" n="EDGEsport" t="19" s="1" num="0" f="0"/>
 		</TS>
 		<TS id="0407" on="0001" frq="11670000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="14b4" n="SAT.1 HD Austria" t="19" s="0" num="0" f="0"/>
@@ -274,7 +265,7 @@
 			<S i="7603" n="11685V SID 0x7603" t="64" s="0" num="0" f="0"/>
 			<S i="7604" n="ANTENA 3" t="1" s="0" num="0" f="0"/>
 			<S i="7606" n="#VAMOS" t="1" s="0" num="0" f="0"/>
-			<S i="7607" n="M. LaLiga 11" t="1" s="0" num="0" f="0"/>
+			<S i="7607" n="TEST P" t="1" s="0" num="0" f="0"/>
 			<S i="7609" n="11685V SID 0x7609" t="64" s="0" num="0" f="0"/>
 			<S i="760c" n="#VAMOS" t="1" s="0" num="0" f="0"/>
 			<S i="760e" n="EUROSPORT 2" t="1" s="0" num="0" f="0"/>
@@ -312,6 +303,7 @@
 		</TS>
 		<TS id="040e" on="0001" frq="11038000" inv="2" sr="22000000" fec="5" pol="1" mod="0" sys="0">
 			<S i="76c0" n="M. ESTRENOS" t="1" s="0" num="0" f="0"/>
+			<S i="76c1" n="11038V SID 0x76c1" t="1" s="0" num="0" f="0"/>
 			<S i="76c2" n="11038V SID 0x76c2" t="1" s="0" num="0" f="0"/>
 			<S i="76c3" n="DISNEY CH." t="1" s="0" num="0" f="0"/>
 			<S i="76c4" n="11038V SID 0x76c4" t="1" s="0" num="0" f="0"/>
@@ -321,6 +313,7 @@
 			<S i="76c8" n="COMEDY CENTRAL" t="1" s="0" num="0" f="0"/>
 			<S i="76c9" n="VIAJAR" t="1" s="0" num="0" f="0"/>
 			<S i="76ca" n="M. SERIESMANIA" t="1" s="0" num="0" f="0"/>
+			<S i="76cb" n="11038V SID 0x76cb" t="1" s="0" num="0" f="0"/>
 			<S i="76cc" n="TELEDEPORTE" t="1" s="0" num="0" f="0"/>
 			<S i="76cd" n="11038V SID 0x76cd" t="64" s="0" num="0" f="0"/>
 			<S i="76ce" n="CANAL COCINA" t="1" s="0" num="0" f="0"/>
@@ -385,6 +378,10 @@
 			<S i="7582" n="LALIGATVBAR4" t="1" s="0" num="0" f="0"/>
 			<S i="7583" n="M.LCAMPEON7" t="1" s="0" num="0" f="0"/>
 			<S i="7584" n="#VAMOS BAR2" t="1" s="0" num="0" f="0"/>
+			<S i="7585" n="11097V SID 0x7585" t="1" s="0" num="0" f="0"/>
+			<S i="7586" n="11097V SID 0x7586" t="1" s="0" num="0" f="0"/>
+			<S i="7587" n="11097V SID 0x7587" t="1" s="0" num="0" f="0"/>
+			<S i="7588" n="11097V SID 0x7588" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0413" on="0001" frq="11111000" inv="2" sr="22000000" fec="2" pol="0" mod="9" sys="1">
 			<S i="30d4" n="SAT.1 Gold HD" t="19" s="1" num="0" f="0"/>
@@ -413,12 +410,15 @@
 			<S i="7729" n="CANAL SUR A." t="1" s="0" num="0" f="0"/>
 			<S i="772a" n="DISNEY XD" t="1" s="0" num="0" f="0"/>
 			<S i="772b" n="CAZA Y PESCA" t="1" s="0" num="0" f="0"/>
+			<S i="772c" n="11156V SID 0x772c" t="1" s="0" num="0" f="0"/>
 			<S i="772d" n="BLAZE" t="1" s="0" num="0" f="0"/>
 			<S i="772e" n="NICKELODEON" t="1" s="0" num="0" f="0"/>
 			<S i="772f" n="DISCOVERY" t="1" s="0" num="0" f="0"/>
 			<S i="7730" n="COSMO" t="1" s="0" num="0" f="0"/>
 			<S i="7731" n="HISTORIA" t="1" s="0" num="0" f="0"/>
 			<S i="7732" n="CRIMEN+INVES" t="1" s="0" num="0" f="0"/>
+			<S i="7733" n="11156V SID 0x7733" t="1" s="0" num="0" f="0"/>
+			<S i="7734" n="11156V SID 0x7734" t="1" s="0" num="0" f="0"/>
 			<S i="7736" n="M. Cine Español" t="1" s="0" num="0" f="0"/>
 			<S i="7737" n="11156V SID 0x7737" t="64" s="0" num="0" f="0"/>
 			<S i="7738" n="24 HORAS" t="1" s="0" num="0" f="0"/>
@@ -443,6 +443,7 @@
 			<S i="7856" n="AXN HD" t="19" s="0" num="0" f="0"/>
 			<S i="7857" n="M.COMEDIA HD" t="19" s="0" num="0" f="0"/>
 			<S i="7859" n="LALIGATV BAR" t="19" s="0" num="0" f="0"/>
+			<S i="785a" n="10729V SID 0x785a" t="1" s="0" num="0" f="0"/>
 			<S i="785e" n="ALQUILER 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="785f" n="M. LaLiga 3 HD" t="19" s="0" num="0" f="0"/>
 			<S i="7861" n="M.LCAMPEON1" t="19" s="0" num="0" f="0"/>
@@ -470,6 +471,9 @@
 			<S i="74a3" n="GOL" t="1" s="0" num="0" f="0"/>
 			<S i="74a4" n="M.FORMULA1" t="1" s="0" num="0" f="0"/>
 			<S i="74a5" n="10758V SID 0x74a5" t="64" s="0" num="0" f="0"/>
+			<S i="74a6" n="10758V SID 0x74a6" t="1" s="0" num="0" f="0"/>
+			<S i="74a7" n="10758V SID 0x74a7" t="1" s="0" num="0" f="0"/>
+			<S i="74a8" n="10758V SID 0x74a8" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="041d" on="0001" frq="10773000" inv="2" sr="22000000" fec="3" pol="0" mod="9" sys="1">
 			<S i="526c" n="ANIXE HD" t="19" s="0" num="0" f="0"/>
@@ -526,7 +530,9 @@
 			<S i="74ff" n="M. LaLiga 1 HD" t="19" s="0" num="0" f="0"/>
 			<S i="7504" n="FOX HD" t="19" s="0" num="0" f="0"/>
 			<S i="7507" n="10817V SID 0x7507" t="64" s="0" num="0" f="0"/>
+			<S i="7508" n="10817V SID 0x7508" t="1" s="0" num="0" f="0"/>
 			<S i="7509" n="M. ACCIÓN HD" t="19" s="0" num="0" f="0"/>
+			<S i="750a" n="10817V SID 0x750a" t="1" s="0" num="0" f="0"/>
 			<S i="750b" n="M. DRAMA HD" t="19" s="0" num="0" f="0"/>
 			<S i="750c" n="HOLLYWOODHD" t="19" s="0" num="0" f="0"/>
 			<S i="750f" n="M. LaLiga HD" t="19" s="0" num="0" f="0"/>
@@ -542,9 +548,11 @@
 			<S i="7596" n="RADIOS" t="1" s="0" num="0" f="0"/>
 			<S i="7598" n="RADIOS ESP" t="2" s="0" num="0" f="0"/>
 			<S i="7599" n="10847V SID 0x7599" t="2" s="0" num="0" f="0"/>
+			<S i="759a" n="10847V SID 0x759a" t="2" s="0" num="0" f="0"/>
 			<S i="759b" n="10847V SID 0x759b" t="1" s="0" num="0" f="0"/>
 			<S i="759c" n="PORTADA" t="1" s="0" num="0" f="0"/>
 			<S i="759e" n="BAJO DEMANDA" t="1" s="0" num="0" f="0"/>
+			<S i="75a4" n="10847V SID 0x75a4" t="64" s="0" num="0" f="0"/>
 			<S i="75a6" n="" t="1" s="0" num="0" f="0"/>
 			<S i="75a7" n="10847V SID 0x75a7" t="64" s="0" num="0" f="0"/>
 			<S i="75a8" n="10847V SID 0x75a8" t="64" s="0" num="0" f="0"/>
@@ -581,11 +589,13 @@
 			<S i="7789" n="M. GOLF" t="1" s="0" num="0" f="0"/>
 			<S i="778a" n="CANAL ODISEA" t="1" s="0" num="0" f="0"/>
 			<S i="778b" n="PLAYBOY TV" t="1" s="0" num="0" f="0"/>
+			<S i="778c" n="10876V SID 0x778c" t="1" s="0" num="0" f="0"/>
 			<S i="778d" n="NAT GEOGRAPH" t="1" s="0" num="0" f="0"/>
 			<S i="778e" n="#VAMOS BAR" t="1" s="0" num="0" f="0"/>
 			<S i="778f" n="M. DEPORTES" t="1" s="0" num="0" f="0"/>
 			<S i="7790" n="CALLE 13" t="1" s="0" num="0" f="0"/>
 			<S i="7791" n="10876V SID 0x7791" t="64" s="0" num="0" f="0"/>
+			<S i="7792" n="10876V SID 0x7792" t="1" s="0" num="0" f="0"/>
 			<S i="7793" n="LALIGATV BAR" t="1" s="0" num="0" f="0"/>
 			<S i="7794" n="10876V SID 0x7794" t="64" s="0" num="0" f="0"/>
 			<S i="7795" n="CANAL DECASA" t="1" s="0" num="0" f="0"/>
@@ -610,27 +620,20 @@
 			<S i="7536" n="TELECINCO HD" t="19" s="0" num="0" f="0"/>
 			<S i="7537" n="LA SEXTA HD" t="19" s="0" num="0" f="0"/>
 			<S i="7538" n="10906V SID 0x7538" t="64" s="0" num="0" f="0"/>
+			<S i="7539" n="10906V SID 0x7539" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0428" on="0001" frq="10935000" inv="2" sr="22000000" fec="2" pol="1" mod="9" sys="1">
 			<S i="7820" n="NICKELODEONHD" t="19" s="0" num="0" f="0"/>
 			<S i="7823" n="MEZZO LIVE HD" t="19" s="0" num="0" f="0"/>
 			<S i="7824" n="CALLE 13 HD" t="19" s="0" num="0" f="0"/>
+			<S i="7825" n="10935V SID 0x7825" t="1" s="0" num="0" f="0"/>
 			<S i="7826" n="EUROSPORT1HD" t="19" s="0" num="0" f="0"/>
 			<S i="7828" n="M. DEPORTESHD" t="19" s="0" num="0" f="0"/>
 			<S i="7829" n="NAT GEO HD" t="19" s="0" num="0" f="0"/>
+			<S i="782c" n="10935V SID 0x782c" t="64" s="0" num="0" f="0"/>
 			<S i="782d" n="TOROS HD" t="19" s="0" num="0" f="0"/>
 			<S i="782e" n="10935V SID 0x782e" t="64" s="0" num="0" f="0"/>
 		</TS>
-		<TS id="042a" on="0001" frq="11739000" inv="2" sr="27500000" fec="3" pol="1" mod="0" sys="0">
-			<S i="6feb" n="Nickelodeon HD" t="1" s="0" num="0" f="0"/>
-			<S i="6ff4" n="NICKELODEON Iberia" t="1" s="0" num="0" f="0"/>
-			<S i="6ff5" n="Nick Jr " t="1" s="0" num="0" f="0"/>
-			<S i="6ff6" n="Nick Jr." t="1" s="0" num="0" f="0"/>
-			<S i="6ff7" n="Nick Jr.." t="1" s="0" num="0" f="0"/>
-			<S i="6ff9" n="Nick Junior Global" t="1" s="0" num="0" f="0"/>
-			<S i="6ffc" n="Nick_Jr." t="1" s="0" num="0" f="0"/>
-			<S i="7005" n="Nick_Jr.." t="1" s="0" num="0" f="0"/>
-		</TS>
 		<TS id="042e" on="0001" frq="11817000" inv="2" sr="29700000" fec="2" pol="1" mod="9" sys="1">
 			<S i="1f41" n="BET" t="19" s="0" num="0" f="0"/>
 			<S i="1f43" n="MTV HITS" t="19" s="0" num="0" f="0"/>
@@ -704,17 +707,19 @@
 			<S i="22d2" n="RMC SPORT 1" t="19" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0436" on="0001" frq="11973000" inv="2" sr="27500000" fec="3" pol="1" mod="0" sys="0">
-			<S i="6fee" n="MTV Hits" t="1" s="0" num="0" f="0"/>
-			<S i="6fef" n="MTV Dance" t="1" s="0" num="0" f="0"/>
+			<S i="6feb" n="Nickelodeon HD" t="1" s="0" num="0" f="0"/>
 			<S i="6ff0" n="VH1" t="1" s="0" num="0" f="0"/>
 			<S i="6ff1" n="VH1 Classic" t="1" s="0" num="0" f="0"/>
-			<S i="6ff3" n="MTV ROCKS" t="1" s="0" num="0" f="0"/>
+			<S i="6ff5" n="Nick Jr" t="1" s="0" num="0" f="0"/>
+			<S i="6ff6" n="Nick Jr." t="1" s="0" num="0" f="0"/>
+			<S i="6ff7" n="Nick Jr.." t="1" s="0" num="0" f="0"/>
+			<S i="6ff9" n="Nick Junior Global" t="1" s="0" num="0" f="0"/>
+			<S i="6ffc" n="Nick_Jr." t="1" s="0" num="0" f="0"/>
 			<S i="6fff" n="MTV Music 24" t="1" s="0" num="0" f="0"/>
 			<S i="7004" n="Comedy Central" t="1" s="0" num="0" f="0"/>
+			<S i="7005" n="Nick_Jr.." t="1" s="0" num="0" f="0"/>
 			<S i="7006" n="MTV" t="1" s="0" num="0" f="0"/>
 			<S i="7008" n="NICK/MTV+" t="1" s="0" num="0" f="0"/>
-			<S i="700a" n="Nicktoons (S)" t="1" s="0" num="0" f="0"/>
-			<S i="700b" n="Nicktoons Turkey" t="1" s="0" num="0" f="0"/>
 		</TS>
 		<TS id="0437" on="0001" frq="11953000" inv="2" sr="27500000" fec="3" pol="0" mod="0" sys="0">
 			<S i="6d66" n="ZDF" t="1" s="0" num="0" f="0"/>
@@ -838,8 +843,7 @@
 			<S i="7085" n="VOX Austria" t="1" s="0" num="0" f="0"/>
 			<S i="708a" n="RTL2 Austria" t="1" s="0" num="0" f="0"/>
 			<S i="708f" n="SUPER RTL A" t="1" s="0" num="0" f="0"/>
-			<S i="7094" n="VOX CH" t="1" s="0" num="0" f="0"/>
-			<S i="7099" n="RTL CH" t="1" s="0" num="0" f="0"/>
+			<S i="7094" n="VOXup" t="1" s="0" num="0" f="0"/>
 			<S i="79e0" n="Eurosport 1 Deutschland" t="1" s="0" num="0" f="0"/>
 			<S i="79ea" n="HSE24 EXTRA" t="1" s="0" num="0" f="0"/>
 			<S i="79f4" n="EURONEWS FRENCH SD" t="1" s="0" num="0" f="0"/>
@@ -924,7 +928,7 @@
 			<S i="6f3f" n="WDR 5" t="2" s="0" num="0" f="0"/>
 			<S i="6f40" n="COSMO" t="2" s="0" num="0" f="0"/>
 			<S i="6f41" n="1LIVE diGGi" t="2" s="0" num="0" f="0"/>
-			<S i="6f42" n="KIRAKA" t="2" s="0" num="0" f="0"/>
+			<S i="6f42" n="Die Maus" t="2" s="0" num="0" f="0"/>
 			<S i="6f43" n="WDR Event" t="2" s="0" num="0" f="0"/>
 			<S i="6f46" n="SR Fernsehen" t="1" s="0" num="0" f="0"/>
 			<S i="6f47" n="ARD-alpha" t="1" s="0" num="0" f="0"/>
@@ -1173,7 +1177,7 @@
 			<S i="3154" n="Achtung Sexy TV" t="1" s="0" num="0" f="0"/>
 			<S i="3155" n="Traumfrauen TV" t="1" s="0" num="0" f="0"/>
 			<S i="3156" n="Heiss und Sexy TV" t="1" s="0" num="0" f="0"/>
-			<S i="3159" n="LEGENDEN TV" t="1" s="0" num="0" f="0"/>
+			<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="1" s="0" num="0" f="0"/>
 			<S i="315a" n="nice" t="1" s="0" num="0" f="0"/>
 			<S i="315b" n="Babestation24" t="1" s="0" num="0" f="0"/>
 			<S i="315c" n="freenet Shopping" t="1" s="0" num="0" f="0"/>
@@ -1527,7 +1531,7 @@
 		<TS id="000d" on="0085" frq="11992000" inv="2" sr="27500000" fec="11" pol="0" mod="9" sys="1">
 			<S i="0031" n="Spiegel TV Wissen" t="16" s="0" num="0" f="0"/>
 			<S i="006e" n="Sky Atlantic HD" t="19" s="0" num="0" f="0"/>
-			<S i="006f" n="Sky Cinema Special HD" t="19" s="0" num="0" f="0"/>
+			<S i="006f" n="Sky Cinema Mittelerde HD" t="19" s="0" num="0" f="0"/>
 			<S i="0070" n="NatGeo HD" t="19" s="0" num="0" f="0"/>
 			<S i="0072" n="Sky Sport 2 HD" t="19" s="0" num="0" f="0"/>
 			<S i="007f" n="13th Street HD" t="19" s="0" num="0" f="0"/>
diff --git a/data/initial/ubouquets.xml b/data/initial/ubouquets.xml
index 02822402b..954c232d5 100644
--- a/data/initial/ubouquets.xml
+++ b/data/initial/ubouquets.xml
@@ -91,17 +91,6 @@
 		<S i="16a9" n="münchen.tv HD" t="3ff" on="1" s="192" frq="11552" l="0"/>
 		<S i="16ab" n="Ulm-Allgäu HD" t="3ff" on="1" s="192" frq="11552" l="0"/>
 		<S i="16ac" n="tv.ingolstadt HD" t="3ff" on="1" s="192" frq="11552" l="0"/>
-		<S i="1252" n="Lokal TV Portal" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11f8" n="a.tv" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11f9" n="Franken Fernsehen" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11fa" n="intv" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11fb" n="Ulm-Allgäu" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11fc" n="münchen.tv" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11fd" n="rfo Regional Oberbayern" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11fe" n="Mainfranken" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="11ff" n="TV Oberfranken" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="1200" n="TVA-OTV" t="3fd" on="1" s="192" frq="11523" l="0"/>
-		<S i="1201" n="Niederbayern" t="3fd" on="1" s="192" frq="11523" l="0"/>
 		<S i="3146" n="rhein main tv" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="4c" n="Baden TV" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="3339" n="L-TV" t="45b" on="1" s="192" frq="12662" l="0"/>
@@ -163,9 +152,6 @@
 		<S i="32d7" n="Mei Musi TV" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="23a2" n="DEUTSCHE GRAMMOPHON+" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="191" n="Jukebox" t="9" on="85" s="192" frq="11170" l="0"/>
-		<S i="6fee" n="MTV Hits" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6fef" n="MTV Dance" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6ff3" n="MTV ROCKS" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff0" n="VH1" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff1" n="VH1 Classic" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6fff" n="MTV Music 24" t="436" on="1" s="192" frq="11973" l="0"/>
@@ -186,7 +172,6 @@
 		<S i="701" n="Disney Channel" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="7008" n="NICK/MTV+" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="3d" n="NICKELODEON AT" t="7" on="85" s="192" frq="12148" l="0"/>
-		<S i="6ff9" n="Nick Junior Global" t="42a" on="1" s="192" frq="11739" l="0"/>
 	</Bouquet>
 	<Bouquet name="news" hidden="0" locked="0">
 		<S i="285b" n="phoenix HD" t="401" on="1" s="192" frq="11582" l="0"/>
@@ -284,9 +269,9 @@
 		<S i="14b8" n="PULS 24 HD" t="407" on="1" s="192" frq="11670" l="0"/>
 		<S i="33b0" n="Service 13232" t="3eb" on="1" s="192" frq="11243" l="0"/>
 		<S i="33b1" n="Service 13233" t="3eb" on="1" s="192" frq="11243" l="0"/>
-		<S i="3459" n="Service 13401" t="3e9" on="1" s="192" frq="11214" l="0"/>
 		<S i="345d" n="Service13405" t="3e9" on="1" s="192" frq="11214" l="0"/>
 		<S i="3464" n="Service 13412" t="3e9" on="1" s="192" frq="11214" l="0"/>
+		<S i="3459" n="Service 13401" t="3e9" on="1" s="192" frq="11214" l="0"/>
 	</Bouquet>
 	<Bouquet name="austriasat" hidden="0" locked="0">
 		<S i="1013" n="Planet" t="451" on="35" s="192" frq="12515" l="0"/>
@@ -294,7 +279,6 @@
 		<S i="6fff" n="MTV Music 24" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="101d" n="AXN Deutschland" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="14c2" n="kabel eins classics" t="407" on="1" s="192" frq="11670" l="0"/>
-		<S i="6ff7" n="Nick Jr.." t="42a" on="1" s="192" frq="11739" l="0"/>
 		<S i="14b4" n="SAT.1 HD Austria" t="407" on="1" s="192" frq="11670" l="0"/>
 		<S i="14b5" n="ProSieben HD Austria" t="407" on="1" s="192" frq="11670" l="0"/>
 		<S i="2e87" n="RTL HD Austria" t="411" on="1" s="192" frq="11082" l="0"/>
@@ -317,10 +301,9 @@
 	</Bouquet>
 	<Bouquet name="schweiz" hidden="0" locked="0">
 		<S i="1260" n="3+" t="3f7" on="1" s="192" frq="11420" l="0"/>
-		<S i="7099" n="RTL CH" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="3070" n="RTL 2 CH" t="3f5" on="1" s="192" frq="11391" l="0"/>
 		<S i="4e26" n="SAT.1 CH" t="43a" on="1" s="192" frq="12051" l="0"/>
-		<S i="7094" n="VOX CH" t="443" on="1" s="192" frq="12226" l="0"/>
+		<S i="7094" n="VOXup" t="443" on="1" s="192" frq="12226" l="0"/>
 		<S i="4e21" n="ProSieben Schweiz" t="43a" on="1" s="192" frq="12051" l="0"/>
 		<S i="4e23" n="Kabel 1 Schweiz" t="43a" on="1" s="192" frq="12051" l="0"/>
 		<S i="3403" n="Starparadies A" t="3ed" on="1" s="192" frq="11273" l="0"/>
@@ -371,7 +354,7 @@
 		<S i="87" n="Sky Cinema +24 HD" t="b" on="85" s="192" frq="12382" l="0"/>
 		<S i="8b" n="Sky Cinema Family HD" t="2" on="85" s="192" frq="11758" l="0"/>
 		<S i="74" n="Sky Cinema Action HD" t="9" on="85" s="192" frq="11170" l="0"/>
-		<S i="6f" n="Sky Cinema Special HD" t="d" on="85" s="192" frq="11992" l="0"/>
+		<S i="6f" n="Sky Cinema Mittelerde HD" t="d" on="85" s="192" frq="11992" l="0"/>
 		<S i="6b" n="Sky Cinema Hits HD" t="c" on="85" s="192" frq="12304" l="0"/>
 		<S i="8c" n="TNT Film HD" t="4" on="85" s="192" frq="12031" l="0"/>
 	</Bouquet>
@@ -523,6 +506,7 @@
 		<S i="28" n="HSE24" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="307" n="MediaShop- Meine Einkaufswelt" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="382" n="MediaShop- Neuheiten" t="21" on="85" s="192" frq="12480" l="0"/>
+		<S i="1406" n="Kaufbei.tv" t="403" on="1" s="192" frq="11611" l="0"/>
 		<S i="2fd" n="pearl.tv Shop" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="2e" n="Handystar TV 2" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="383" n="meinTVshop" t="21" on="85" s="192" frq="12480" l="0"/>
@@ -538,7 +522,7 @@
 		<S i="381" n="e8 television" t="21" on="85" s="192" frq="12480" l="0"/>
 		<S i="202" n="Immer etwas Neues TV" t="7" on="85" s="192" frq="12148" l="0"/>
 		<S i="20" n="Sonnenklar TV" t="21" on="85" s="192" frq="12480" l="0"/>
-		<S i="3159" n="LEGENDEN TV" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="293" n="Handystar TV" t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="32d7" n="Mei Musi TV" t="45d" on="1" s="192" frq="12692" l="0"/>
 		<S i="4a" n="Nicer Dicer TV" t="5" on="85" s="192" frq="12460" l="0"/>
@@ -710,8 +694,9 @@
 		<S i="76c4" n="11038V SID 0x76c4" t="40e" on="1" s="192" frq="11038" l="0"/>
 		<S i="101e" n="Elevensports1" t="451" on="35" s="192" frq="12515" l="0"/>
 		<S i="13d9" n="MB LIVE" t="3ea" on="1" s="192" frq="11229" l="0"/>
-		<S i="1195" n="Sport1+ HD" t="406" on="1" s="192" frq="11656" l="0"/>
-		<S i="1196" n="ESport1 HD" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1195" n="SPORT1+" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1196" n="eSPORTS1" t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="1197" n="EDGEsport" t="406" on="1" s="192" frq="11656" l="0"/>
 		<S i="759b" n="10847V SID 0x759b" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="75f3" n="" t="422" on="1" s="192" frq="10847" l="0"/>
 		<S i="30d5" n="." t="413" on="1" s="192" frq="11111" l="0"/>
@@ -725,32 +710,47 @@
 		<S i="2394" n="12363V SID 0x2394" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="23d2" n="12363V SID 0x23d2" t="44a" on="1" s="192" frq="12363" l="0"/>
 		<S i="7853" n="10729V SID 0x7853" t="41a" on="1" s="192" frq="10729" l="0"/>
-		<S i="1197" n="." t="406" on="1" s="192" frq="11656" l="0"/>
+		<S i="7825" n="10935V SID 0x7825" t="428" on="1" s="192" frq="10935" l="0"/>
+		<S i="7539" n="10906V SID 0x7539" t="426" on="1" s="192" frq="10906" l="0"/>
+		<S i="7792" n="10876V SID 0x7792" t="424" on="1" s="192" frq="10876" l="0"/>
+		<S i="778c" n="10876V SID 0x778c" t="424" on="1" s="192" frq="10876" l="0"/>
+		<S i="750a" n="10817V SID 0x750a" t="420" on="1" s="192" frq="10817" l="0"/>
+		<S i="7508" n="10817V SID 0x7508" t="420" on="1" s="192" frq="10817" l="0"/>
+		<S i="74a8" n="10758V SID 0x74a8" t="41c" on="1" s="192" frq="10758" l="0"/>
+		<S i="74a7" n="10758V SID 0x74a7" t="41c" on="1" s="192" frq="10758" l="0"/>
+		<S i="74a6" n="10758V SID 0x74a6" t="41c" on="1" s="192" frq="10758" l="0"/>
+		<S i="785a" n="10729V SID 0x785a" t="41a" on="1" s="192" frq="10729" l="0"/>
+		<S i="7734" n="11156V SID 0x7734" t="416" on="1" s="192" frq="11156" l="0"/>
+		<S i="7733" n="11156V SID 0x7733" t="416" on="1" s="192" frq="11156" l="0"/>
+		<S i="772c" n="11156V SID 0x772c" t="416" on="1" s="192" frq="11156" l="0"/>
+		<S i="7588" n="11097V SID 0x7588" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="7587" n="11097V SID 0x7587" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="7586" n="11097V SID 0x7586" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="7585" n="11097V SID 0x7585" t="412" on="1" s="192" frq="11097" l="0"/>
+		<S i="76cb" n="11038V SID 0x76cb" t="40e" on="1" s="192" frq="11038" l="0"/>
+		<S i="76c1" n="11038V SID 0x76c1" t="40e" on="1" s="192" frq="11038" l="0"/>
+		<S i="7474" n="11317V SID 0x7474" t="3f0" on="1" s="192" frq="11317" l="0"/>
+		<S i="7473" n="11317V SID 0x7473" t="3f0" on="1" s="192" frq="11317" l="0"/>
+		<S i="7472" n="11317V SID 0x7472" t="3f0" on="1" s="192" frq="11317" l="0"/>
+		<S i="78be" n="11258V SID 0x78be" t="3ec" on="1" s="192" frq="11258" l="0"/>
+		<S i="78b9" n="11258V SID 0x78b9" t="3ec" on="1" s="192" frq="11258" l="0"/>
 	</Bouquet>
 	<Bouquet name="MTV Networks" hidden="0" locked="0">
 		<S i="7004" n="Comedy Central" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="7008" n="NICK/MTV+" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6ff9" n="Nick Junior Global" t="42a" on="1" s="192" frq="11739" l="0"/>
-		<S i="6fef" n="MTV Dance" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6fee" n="MTV Hits" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6ff3" n="MTV ROCKS" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff0" n="VH1" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff1" n="VH1 Classic" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6fff" n="MTV Music 24" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6fee" n="MTV Hits" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6fef" n="MTV Dance" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff0" n="VH1" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff1" n="VH1 Classic" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="700b" n="Nicktoons Turkey" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="700a" n="Nicktoons (S)" t="436" on="1" s="192" frq="11973" l="0"/>
-		<S i="6feb" n="Nickelodeon HD" t="42a" on="1" s="192" frq="11739" l="0"/>
-		<S i="6ff4" n="NICKELODEON Iberia" t="42a" on="1" s="192" frq="11739" l="0"/>
-		<S i="6ff5" n="Nick Jr " t="42a" on="1" s="192" frq="11739" l="0"/>
-		<S i="6ff6" n="Nick Jr." t="42a" on="1" s="192" frq="11739" l="0"/>
-		<S i="6ff7" n="Nick Jr.." t="42a" on="1" s="192" frq="11739" l="0"/>
-		<S i="6ffc" n="Nick_Jr." t="42a" on="1" s="192" frq="11739" l="0"/>
-		<S i="7005" n="Nick_Jr.." t="42a" on="1" s="192" frq="11739" l="0"/>
 		<S i="7006" n="MTV" t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="7005" n="Nick_Jr.." t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6ffc" n="Nick_Jr." t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6ff9" n="Nick Junior Global" t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6ff7" n="Nick Jr.." t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6ff6" n="Nick Jr." t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6ff5" n="Nick Jr" t="436" on="1" s="192" frq="11973" l="0"/>
+		<S i="6feb" n="Nickelodeon HD" t="436" on="1" s="192" frq="11973" l="0"/>
 	</Bouquet>
 	<Bouquet name="Telesat" hidden="0" locked="0">
 		<S i="6fff" n="MTV Music 24" t="436" on="1" s="192" frq="11973" l="0"/>
@@ -826,7 +826,7 @@
 		<S i="7789" n="M. GOLF" t="424" on="1" s="192" frq="10876" l="0"/>
 		<S i="769c" n="M. LaLiga 3" t="41e" on="1" s="192" frq="10788" l="0"/>
 		<S i="749d" n="M. DISNEY" t="41c" on="1" s="192" frq="10758" l="0"/>
-		<S i="7607" n="M. LaLiga 11" t="408" on="1" s="192" frq="11685" l="0"/>
+		<S i="7607" n="TEST P" t="408" on="1" s="192" frq="11685" l="0"/>
 		<S i="778e" n="#VAMOS BAR" t="424" on="1" s="192" frq="10876" l="0"/>
 		<S i="772e" n="NICKELODEON" t="416" on="1" s="192" frq="11156" l="0"/>
 		<S i="7570" n="TOROS" t="412" on="1" s="192" frq="11097" l="0"/>
@@ -1291,7 +1291,6 @@
 	<Bouquet name="CANALDIGITAAL" hidden="0" locked="0">
 		<S i="272e" n="CNBC Europe" t="402" on="1" s="192" frq="11597" l="0"/>
 		<S i="fe2" n="RTL Lounge" t="451" on="35" s="192" frq="12515" l="0"/>
-		<S i="6ff7" n="Nick Jr.." t="42a" on="1" s="192" frq="11739" l="0"/>
 		<S i="6fff" n="MTV Music 24" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="6ff1" n="VH1 Classic" t="436" on="1" s="192" frq="11973" l="0"/>
 		<S i="fe0" n="Vivid" t="451" on="35" s="192" frq="12515" l="0"/>
@@ -1329,7 +1328,7 @@
 		<S i="18ec" n="TELESUR HD" t="3f4" on="1" s="192" frq="11376" l="0"/>
 	</Bouquet>
 	<Bouquet name="MEDIA BROADCAST" hidden="0" locked="0">
-		<S i="3159" n="LEGENDEN TV" t="459" on="1" s="192" frq="12633" l="0"/>
+		<S i="3159" n="Volksmusik.TV - Der neue Sender!" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="315a" n="nice" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="3138" n="health.tv" t="459" on="1" s="192" frq="12633" l="0"/>
 		<S i="313f" n="freenet TV connect" t="459" on="1" s="192" frq="12633" l="0"/>
@@ -1354,6 +1353,9 @@
 	<Bouquet name="Arqiva" hidden="0" locked="0">
 		<S i="1158" n="Al Jazeera English" t="404" on="1" s="192" frq="11626" l="0"/>
 	</Bouquet>
+	<Bouquet name="Harmonic/Telespazio/RFI" hidden="0" locked="0">
+		<S i="1090" n="D7 TV" t="3ee" on="1" s="192" frq="11288" l="0"/>
+	</Bouquet>
 	<Bouquet name="DATA" hidden="0" locked="0">
 		<S i="c8" n="BDL VoD" t="3" on="85" s="192" frq="11719" l="0"/>
 		<S i="6e5a" n="ARD-Data-1" t="431" on="1" s="192" frq="12109" l="0"/>
@@ -1494,6 +1496,8 @@
 		<S i="21f3" n="DOWNLOAD G10 SAGEM" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="21f4" n="DOWNLOAD G10 HUMAX" t="448" on="1" s="192" frq="12324" l="0"/>
 		<S i="ff5" n="MZ-102" t="451" on="35" s="192" frq="12515" l="0"/>
+		<S i="75a4" n="10847V SID 0x75a4" t="422" on="1" s="192" frq="10847" l="0"/>
+		<S i="782c" n="10935V SID 0x782c" t="428" on="1" s="192" frq="10935" l="0"/>
 	</Bouquet>
 	<Bouquet name="Favourites (TV)" hidden="0" locked="0">
 	</Bouquet>
@@ -1502,7 +1506,7 @@
 		<S i="6d6c" n="Dlf Kultur" t="437" on="1" s="192" frq="11953" l="0"/>
 		<S i="6d71" n="Dlf Nova" t="437" on="1" s="192" frq="11953" l="0"/>
 		<S i="6d6f" n="DRadio DokDeb" t="437" on="1" s="192" frq="11953" l="0"/>
-		<S i="6f42" n="KIRAKA" t="445" on="1" s="192" frq="12265" l="0"/>
+		<S i="6f42" n="Die Maus" t="445" on="1" s="192" frq="12265" l="0"/>
 		<S i="6f26" n="Antenne Brandenburg" t="445" on="1" s="192" frq="12265" l="0"/>
 		<S i="6f29" n="Fritz" t="445" on="1" s="192" frq="12265" l="0"/>
 		<S i="6f24" n="Inforadio" t="445" on="1" s="192" frq="12265" l="0"/>
@@ -1683,6 +1687,7 @@
 		<S i="af" n="." t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="ae" n="." t="5" on="85" s="192" frq="12460" l="0"/>
 		<S i="ab" n="." t="5" on="85" s="192" frq="12460" l="0"/>
+		<S i="759a" n="10847V SID 0x759a" t="422" on="1" s="192" frq="10847" l="0"/>
 	</Bouquet>
 	<Bouquet name="MEDIA BROADCAST" hidden="0" locked="0">
 		<S i="3170" n="Radio HBR" t="459" on="1" s="192" frq="12633" l="0"/>