diff --git a/admin/statistics_function.php b/admin/statistics_function.php
index 55d09151b20..b52a27b18c6 100644
--- a/admin/statistics_function.php
+++ b/admin/statistics_function.php
@@ -109,8 +109,11 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
 	//no survey ID? -> come and get one
 	if (!isset($surveyid)) {$surveyid=returnglobal('sid');}
 	
-	// Set language for questions and labels to base language of this survey
-	//$language = GetBaseLanguageFromSurveyID($surveyid);
+    //Get an array of codes of all available languages in this survey
+    $surveylanguagecodes = GetAdditionalLanguagesFromSurveyID($surveyid);
+    $surveylanguagecodes[] = GetBaseLanguageFromSurveyID($surveyid);
+
+    // Set language for questions and labels to base language of this survey
 	$language='en';
     //$surveyid=sanitize_int($surveyid);
 	$query = "SELECT language FROM {$dbprefix}surveys WHERE sid=$surveyid";
@@ -1576,8 +1579,8 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
 	
 	
 					case "I": //Language
-						// Using previously defined $survlangs array of language codes
-						foreach ($survlangs as $availlang)
+						// Using previously defined $surveylanguagecodes array of language codes
+						foreach ($surveylanguagecodes as $availlang)
 						{
 							$alist[]=array($availlang, getLanguageNameFromCode($availlang,false));
 						}
diff --git a/common.php b/common.php
index e5c4074445e..2a1c590ce85 100644
--- a/common.php
+++ b/common.php
@@ -3236,7 +3236,14 @@ function getQuestionAttributes($qid, $type='')
     }
     
     $availableattributes=questionAttributes();
-    $availableattributes=$availableattributes[$type];                           
+    if (isset($availableattributes[$type]))
+    {
+        $availableattributes=$availableattributes[$type];
+    }
+    else
+    {
+        return array();
+    }
     
     foreach($availableattributes as $attribute){
         $defaultattributes[$attribute['name']]=$attribute['default'];
@@ -3430,7 +3437,7 @@ function questionAttributes($returnByName=false)
     "caption"=>$clang->gT('Hide tip'));
   
     $qattributes['hidden']=array(
-    'types'=>'15ABCDEFGHKLMNOPQRSTUWXYZ!:;',
+    'types'=>'15ABCDEFGHIKLMNOPQRSTUWXYZ!:;',
     'category'=>$clang->gT('Display'),
     'sortorder'=>101,
     'inputtype'=>'singleselect',