diff --git a/data/encoding.conf b/data/encoding.conf
index 8d24819cc..7fff6091c 100644
--- a/data/encoding.conf
+++ b/data/encoding.conf
@@ -1,45 +1,45 @@
-#Fallback encoding when in dvb-text no encoding table is given
-#Countycode ISO8859-X
-tur ISO8859-9
-gre ISO8859-7
-pol ISO8859-2
-rus ISO8859-5
-bul ISO8859-5
-cn ISO3166-2
-#Table of transponder using two byte char mappings (VideoTexSuppl)
-#TSID ONID
-0x447 0x1 #ASTRA 19.2° UPC Direct
-0x427 0x1 #ASTRA 19.2° UPC Direct
-0x44b 0x1 #ASTRA 19.2° UPC Direct
-0x4ff 0x1 #ASTRA 19.2° UPC Direct
-0x407 0x1 #ASTRA 19.2° UPC Direct
-0x436 0x1 #ASTRA 19.2° MTV Euro - MTV Networks
-0x42a 0x1 #ASTRA 19.2° VH1 Classic - MTV Networks
-0xc23 0x3 #ASTRA 23.5° CzechLink
-0xc93 0x3 #ASTRA 23.5° CzechLink
-0xc95 0x3 #ASTRA 23.5° CzechLink
-0xc8b 0x3 #ASTRA 23.5° CzechLink
-0xc89 0x3 #ASTRA 23.5° CzechLink
-0xbc7 0x3 #ASTRA 23.5° CzechLink
-0xc8f 0x3 #ASTRA 23.5° CzechLink
-0xc85 0x3 #ASTRA 23.5° CzechLink
-0xbc6 0x3 #ASTRA 23.5° CzechLink
-#TSID ONID
-0x1 0x601 #UPC Cable Hungary
-0x2 0x601 #UPC Cable Hungary
-0x3 0x601 #UPC Cable Hungary
-0x4 0x601 #UPC Cable Hungary
-0x5 0x601 #UPC Cable Hungary
-0x6 0x601 #UPC Cable Hungary
-0x7 0x601 #UPC Cable Hungary
-0x8 0x601 #UPC Cable Hungary
-0x9 0x601 #UPC Cable Hungary
-0xa 0x601 #UPC Cable Hungary
-0xb 0x601 #UPC Cable Hungary
-0xc 0x601 #UPC Cable Hungary
-0xd 0x601 #UPC Cable Hungary
-0xe 0x601 #UPC Cable Hungary
-0xf 0x601 #UPC Cable Hungary
+#Fallback encoding when in dvb-text no encoding table is given
+#Countycode ISO8859-X
+tur ISO8859-9
+gre ISO8859-7
+pol ISO8859-2
+rus ISO8859-5
+bul ISO8859-5
+cn ISO3166-2
+#Table of transponder using two byte char mappings (VideoTexSuppl)
+#TSID ONID
+0x447 0x1 #ASTRA 19.2° UPC Direct
+0x427 0x1 #ASTRA 19.2° UPC Direct
+0x44b 0x1 #ASTRA 19.2° UPC Direct
+0x4ff 0x1 #ASTRA 19.2° UPC Direct
+0x407 0x1 #ASTRA 19.2° UPC Direct
+0x436 0x1 #ASTRA 19.2° MTV Euro - MTV Networks
+0x42a 0x1 #ASTRA 19.2° VH1 Classic - MTV Networks
+0xc23 0x3 #ASTRA 23.5° CzechLink
+0xc93 0x3 #ASTRA 23.5° CzechLink
+0xc95 0x3 #ASTRA 23.5° CzechLink
+0xc8b 0x3 #ASTRA 23.5° CzechLink
+0xc89 0x3 #ASTRA 23.5° CzechLink
+0xbc7 0x3 #ASTRA 23.5° CzechLink
+0xc8f 0x3 #ASTRA 23.5° CzechLink
+0xc85 0x3 #ASTRA 23.5° CzechLink
+0xbc6 0x3 #ASTRA 23.5° CzechLink
+#TSID ONID
+0x1 0x601 #UPC Cable Hungary
+0x2 0x601 #UPC Cable Hungary
+0x3 0x601 #UPC Cable Hungary
+0x4 0x601 #UPC Cable Hungary
+0x5 0x601 #UPC Cable Hungary
+0x6 0x601 #UPC Cable Hungary
+0x7 0x601 #UPC Cable Hungary
+0x8 0x601 #UPC Cable Hungary
+0x9 0x601 #UPC Cable Hungary
+0xa 0x601 #UPC Cable Hungary
+0xb 0x601 #UPC Cable Hungary
+0xc 0x601 #UPC Cable Hungary
+0xd 0x601 #UPC Cable Hungary
+0xe 0x601 #UPC Cable Hungary
+0xf 0x601 #UPC Cable Hungary
# UPC Direct Thor 1.0W
0x2b2 0x600
0x2bd 0x600
@@ -55,22 +55,24 @@ cn ISO3166-2
0x2e 0x46
0x1 0x1111
0x2 0x1111
-0x3 0x1111
-11000 318 #Hotbird 13.0° Cyfra+
-11900 318
-12200 318
-1500 318
-400 318
-0x5dc 0x13e
-#Fallback encoding table for following transponders
-#TSID ONID ISO8859-X
-#0x447 0x1 ISO8859-9
-50100 126 ISO8859-9 # Digiturk 7°E 11.471 V 30.000 3/4
-50200 126 ISO8859-9 # Digiturk 7°E 11.492 V 30.000 3/4
-50300 126 ISO8859-9 # Digiturk 7°E 11.639 H 30.000 3/4
-50400 126 ISO8859-9 # Digiturk 7°E 11.534 V 30.000 3/4
-50600 126 ISO8859-9 # Digiturk 7°E 11.575 V and 42°E 11.729 V 15.555 5/6
-50700 126 ISO8859-9 # Digiturk 7°E 11.596 H 30.000 3/4
-50800 126 ISO8859-9 # Digiturk 7°E 11.678 H 30.000 3/4
-50900 126 ISO8859-9 # Digiturk 7°E 11.513 H 27.500 3/4
-51000 126 ISO8859-9 # Digiturk 7°E 11.617 V 30.000 3/4
+0x3 0x1111
+11000 318 #Hotbird 13.0° Cyfra+
+11900 318
+11400 318
+12200 318
+13200 113
+1500 318
+400 318
+0x5dc 0x13e
+#Fallback encoding table for following transponders
+#TSID ONID ISO8859-X
+#0x447 0x1 ISO8859-9
+50100 126 ISO8859-9 # Digiturk 7°E 11.471 V 30.000 3/4
+50200 126 ISO8859-9 # Digiturk 7°E 11.492 V 30.000 3/4
+50300 126 ISO8859-9 # Digiturk 7°E 11.639 H 30.000 3/4
+50400 126 ISO8859-9 # Digiturk 7°E 11.534 V 30.000 3/4
+50600 126 ISO8859-9 # Digiturk 7°E 11.575 V and 42°E 11.729 V 15.555 5/6
+50700 126 ISO8859-9 # Digiturk 7°E 11.596 H 30.000 3/4
+50800 126 ISO8859-9 # Digiturk 7°E 11.678 H 30.000 3/4
+50900 126 ISO8859-9 # Digiturk 7°E 11.513 H 27.500 3/4
+51000 126 ISO8859-9 # Digiturk 7°E 11.617 V 30.000 3/4
diff --git a/data/satellites.xml b/data/satellites.xml
index 3df20e2a0..4f00319e2 100755
--- a/data/satellites.xml
+++ b/data/satellites.xml
@@ -1565,6 +1565,7 @@
+