diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 072563e2d25..1f207b9d504 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -1695,7 +1695,7 @@ function getSIDGIDQIDAIDType($fieldcode)
 */
 function getExtendedAnswer($iSurveyID, $sFieldCode, $sValue, $oLanguage)
 {
-    if (is_null($sValue) || $sValue=='') return '';
+    if ($sValue==null || $sValue=='') return '';
     $sLanguage = $oLanguage->langcode;
     //Fieldcode used to determine question, $sValue used to match against answer code
     //Returns NULL if question type does not suit
diff --git a/application/libraries/Limesurvey_lang.php b/application/libraries/Limesurvey_lang.php
index d47c23bb4b9..27b461df8cc 100644
--- a/application/libraries/Limesurvey_lang.php
+++ b/application/libraries/Limesurvey_lang.php
@@ -110,13 +110,13 @@ function eT($string, $escapemode = 'html')
         * @param mixed $escapemode Different uses require the string to be escaped accordinlgy. Possible values are 'html'(default),'js' and 'unescaped'
         * @return string Translated string
         */
-        function gT($string, $escapemode = 'html')
+        function gT($sText, $sEscapeMode = 'html')
         {
             if ($this->gettextclass)
             {
-                $basestring=str_replace('‘','\'',$this->gettextclass->translate($string));
+                $basestring=$this->gettextclass->translate($sText);
 
-                switch ($escapemode)
+                switch ($sEscapeMode)
                 {
                     case 'html':
                         return $this->HTMLEscape($basestring);
@@ -132,16 +132,16 @@ function gT($string, $escapemode = 'html')
                         break;
                 }
             } else {
-                switch ($escapemode)
+                switch ($sEscapeMode)
                 {
                     case 'html':
-                        return $this->HTMLEscape($string);
+                        return $this->HTMLEscape($sText);
                         break;
                     case 'js':
-                        return $this->javascriptEscape($string);
+                        return $this->javascriptEscape($sText);
                         break;
                     case 'unescaped':
-                        return $string;
+                        return $sText;
                         break;
                     default:
                         return "Unsupported EscapeMode in gT method";
diff --git a/application/views/admin/responses/browseallrow_view.php b/application/views/admin/responses/browseallrow_view.php
index f526d2ee222..cf431fa3295 100644
--- a/application/views/admin/responses/browseallrow_view.php
+++ b/application/views/admin/responses/browseallrow_view.php
@@ -40,7 +40,7 @@
 
         for ($i; $i < $fncount; $i++)
         {
-            if (isset($fnames[$i]['type']) && $fnames[$i]['type'] == "|")
+            if (isset($fnames[$i]['type']) && $fnames[$i]['type'] == "|" && $dtrow[$fnames[$i][0]]!='')
             {
                 $index = $fnames[$i]['index'];
                 $metadata = $fnames[$i]['metadata'];