diff --git a/data/y-web/Y_Menue.yhtm b/data/y-web/Y_Menue.yhtm
index 54083b0c7..e3fd342be 100644
--- a/data/y-web/Y_Menue.yhtm
+++ b/data/y-web/Y_Menue.yhtm
@@ -1,11 +1,13 @@
 {=global-var-set:boxtype=coolstream=}
 {=global-var-set:alpha=true=}
 
-{=global-var-set:graphlcd=false=}
-	{=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~	{=global-var-set:graphlcd=true=}~=}
-	{=if-equal:{=var-get:boxtype=}~VU+ DUO4K~	{=global-var-set:graphlcd=true=}~=}
-	{=if-equal:{=var-get:boxtype=}~VU+ ULTIMO4K~	{=global-var-set:graphlcd=true=}~=}
-	{=if-equal:{=var-get:boxtype=}~VU+ UNO4KSE~	{=global-var-set:graphlcd=true=}~=}
+{=var-set:boxtype={=func:get_boxtype=}=}
+{=global-var-set:graphlcd={=if-equal:{=var-get:boxtype=}~VU+ SOLO4K~true~
+	{=if-equal:{=var-get:boxtype=}~VU+ DUO4K~true~
+	{=if-equal:{=var-get:boxtype=}~VU+ ULTIMO4K~true~
+	{=if-equal:{=var-get:boxtype=}~VU+ UNO4KSE~true~false
+	=}=}=}=}
+=}
 
 {=include-block:Y_Blocks.txt;head=}
 <script type="text/javascript" src="/prototype.js"></script>
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch
index c0c703f4b..f67693fc9 100644
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -104,6 +104,8 @@ bc.menue.messages_desc=Nachricht an die Box senden
 bc.menue.messages=Nachrichten
 bc.menue.remote_desc=Fernbedienung
 bc.menue.remote=Fernbedienung
+bc.menue.glcd_screenshot_desc=GLCD Screenshot erstellen
+bc.menue.glcd_screenshot=GLCD Screenshot
 bc.menue.lcd_screenshot_desc=LCD Screenshot erstellen
 bc.menue.lcd_screenshot=LCD Screenshot
 bc.menue.lcd_screenshot_desc_ni=lcshot nicht installiert in /bin oder /var/bin
@@ -119,6 +121,8 @@ bc.menue.webinf_slavebox=Webinterface der SlaveBox
 bc.menue.volumen_display=Lautst&auml;rke Anzeige
 
 bc.menue.signal=Signalst&auml;rke
+bc.menue.sig_display=Signalst&auml;rke
+bc.menue.snr_display=(Signal-)Rauschabstand
 
 ========= Boxcontrol
 bc.control.freemem=FreeMem
@@ -245,6 +249,7 @@ set.menue.recording=Aufnahme
 set.menue.audio_player=Audioplayer
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Bildbetrachter
+set.menue.glcd_display=GLC-Display
 set.menue.lcd_display=LC-Display
 set.menue.key_settings=Tastenbelegung
 set.menue.boot_options=Bootoptionen
diff --git a/data/y-web/languages/English b/data/y-web/languages/English
index e00420bfa..3d4229a5e 100644
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -106,7 +106,9 @@ bc.menue.messages_desc=send Messages to box
 bc.menue.messages=Messages
 bc.menue.remote_desc=Web-based Remote Control
 bc.menue.remote=Remote
-bc.menue.lcd_screenshot_desc=make lcd screenshot
+bc.menue.glcd_screenshot_desc=take a GLCD screenshot
+bc.menue.glcd_screenshot=GLCD Screenshot
+bc.menue.lcd_screenshot_desc=take a lcd screenshot
 bc.menue.lcd_screenshot=LCD Screenshot
 bc.menue.lcd_screenshot_desc_ni=lcshot not installed at /bin or /var/bin
 bc.menue.screenshot=Screenshot
@@ -121,6 +123,8 @@ bc.menue.webinf_slavebox=Webinterface der SlaveBox
 bc.menue.volumen_display=volumen display
 
 bc.menue.signal=Signal strength
+bc.menue.sig_display=Signal strength
+bc.menue.snr_display=signal-to-noise ratio
 
 ========= Boxcontrol
 bc.control.freemem=FreeMem
@@ -248,6 +252,7 @@ set.menue.recording=Recording
 set.menue.audio_player=Audioplayer
 set.menue.movieplayer=Movieplayer
 set.menue.pictureviewer=Picture Viewer
+set.menue.glcd_display=GLC-Display
 set.menue.lcd_display=LC-Display
 set.menue.key_settings=Key Layout
 set.menue.boot_options=Boot options
diff --git a/src/nhttpd/yhttpd_core/helper.cpp b/src/nhttpd/yhttpd_core/helper.cpp
index 8bd342654..1fa303974 100644
--- a/src/nhttpd/yhttpd_core/helper.cpp
+++ b/src/nhttpd/yhttpd_core/helper.cpp
@@ -101,6 +101,10 @@ bool ySplitString(std::string str, std::string delimiter, std::string& left,
 		left = str; //default if not found
 		right = "";
 	}
+	replace(left,  "\r\n", "");
+	replace(left,  "\n",   "");
+	replace(right, "\r\n", "");
+	replace(right, "\n",   "");
 	return (pos != std::string::npos);
 }
 //-------------------------------------------------------------------------