diff --git a/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php b/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php
index f18817c09..215e6d6ac 100644
--- a/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php
+++ b/admin/survey/modules/mod_kakovost/class.SurveyKakovost.php
@@ -610,76 +610,27 @@ class SurveyKakovost{
 	
 		$fd = fopen($temp_folder.'/questions_'.$this->anketa.'.csv', "w");
 		
-		
+
 		// Prva vrstica
-		$output = '';
-		$output .= 'ID SURVEY'.delimiter;
+		$output = 'ID SURVEY'.delimiter;
 		$output .= 'ID QUESTION'.delimiter;
 		$output .= 'ID PAGE'.delimiter;
 		$output .= 'QUESTION NUMBER'.delimiter;
 		
-		/*$output .= 'naslov'.delimiter;
-		$output .= 'info'.delimiter;*/
 		$output .= 'variable'.delimiter;
-		/*$output .= 'variable_custom'.delimiter;
-		$output .= 'label'.delimiter;*/
 		$output .= 'tip'.delimiter;
 		$output .= 'vrstni_red'.delimiter;
-		//$output .= 'random'.delimiter;
 		$output .= 'size'.delimiter;
-		/*$output .= 'undecided'.delimiter;
-		$output .= 'rejected'.delimiter;
-		$output .= 'inappropriate'.delimiter;
-		$output .= 'stat'.delimiter;
-		$output .= 'orientation'.delimiter;
-		$output .= 'checkboxhide'.delimiter;
-		$output .= 'reminder'.delimiter;*/
 		$output .= 'visible'.delimiter;
-		/*$output .= 'textfield'.delimiter;
-		$output .= 'textfield_label'.delimiter;
-		$output .= 'cela'.delimiter;
-		$output .= 'decimalna'.delimiter;
-		$output .= 'enota'.delimiter;
-		$output .= 'timer'.delimiter;
-		$output .= 'sistem'.delimiter;
-		$output .= 'folder'.delimiter;*/
 		$output .= 'params'.delimiter;
-		/*$output .= 'antonucci'.delimiter;
-		$output .= 'design'.delimiter;
-		$output .= 'podpora'.delimiter;
-		$output .= 'grids'.delimiter;
-		$output .= 'grids_edit'.delimiter;
-		$output .= 'grid_subtitle1'.delimiter;
-		$output .= 'grid_subtitle2'.delimiter;
-		$output .= 'ranking_k'.delimiter;
-		$output .= 'vsota'.delimiter;
-		$output .= 'vsota_limit'.delimiter;
-		$output .= 'vsota_min'.delimiter;
-		$output .= 'skala'.delimiter;
-		$output .= 'vsota_reminder'.delimiter;
-		$output .= 'vsota_limittype'.delimiter;
-		$output .= 'vsota_show'.delimiter;
-		$output .= 'thread'.delimiter;
-		$output .= 'text_kosov'.delimiter;
-		$output .= 'text_orientation'.delimiter;
-		$output .= 'note'.delimiter;
-		$output .= 'upload'.delimiter;
-		$output .= 'dostop'.delimiter;
-		$output .= 'inline_edit'.delimiter;
-		$output .= 'onchange_submit'.delimiter;
-		$output .= 'hidden_default'.delimiter;
-		$output .= 'naslov_graf'.delimiter;
-		$output .= 'edit_graf'.delimiter;
-		$output .= 'wide_graf'.delimiter;
-		$output .= 'coding'.delimiter;
-		$output .= 'dynamic_mg'.delimiter;
-		$output .= 'QUESTION IF'.delimiter;*/
+
+		$output .= 'char_count'.delimiter;
 		
 		fwrite($fd, $output."\r\n");
 		
 			
 		// Vrstice s podatki
-		$sql = sisplet_query("SELECT s.id, s.gru_id, s.variable, s.tip, s.vrstni_red, s.size, s.visible, s.params 
+		$sql = sisplet_query("SELECT s.id, s.gru_id, s.variable, s.tip, s.vrstni_red, s.size, s.visible, s.params, CHAR_LENGTH(s.naslov) AS char_count
 								FROM srv_spremenljivka s, srv_grupa g 
 								WHERE s.gru_id=g.id AND g.ank_id='".$this->anketa."' 
 								ORDER BY g.vrstni_red, s.vrstni_red");
@@ -699,70 +650,21 @@ class SurveyKakovost{
 				$line .= $row['gru_id'].delimiter;
 				$line .= $i.delimiter;
 				
-				/*$line .= str_replace("\n", '', str_replace(delimiter, '', $row['naslov']) ).delimiter;
-				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['info']) ).delimiter;*/
 				$line .= $row['variable'].delimiter;
-				/*$line .= $row['variable_custom'].delimiter;
-				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['label']) ).delimiter;*/
 				$line .= $row['tip'].delimiter;
 				$line .= $row['vrstni_red'].delimiter;
-				//$line .= $row['random'].delimiter;
 				$line .= $row['size'].delimiter;
-				/*$line .= $row['undecided'].delimiter;
-				$line .= $row['rejected'].delimiter;
-				$line .= $row['inappropriate'].delimiter;
-				$line .= $row['stat'].delimiter;
-				$line .= $row['orientation'].delimiter;
-				$line .= $row['checkboxhide'].delimiter;
-				$line .= $row['reminder'].delimiter;*/
 				$line .= $row['visible'].delimiter;
-				/*$line .= $row['textfield'].delimiter;
-				$line .= $row['textfield_label'].delimiter;
-				$line .= $row['cela'].delimiter;
-				$line .= $row['decimalna'].delimiter;
-				$line .= $row['enota'].delimiter;
-				$line .= $row['timer'].delimiter;
-				$line .= $row['sistem'].delimiter;
-				$line .= $row['folder'].delimiter;*/
+
 				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['params']) ).delimiter;
-				/*$line .= $row['antonucci'].delimiter;
-				$line .= $row['design'].delimiter;
-				$line .= $row['podpora'].delimiter;
-				$line .= $row['grids'].delimiter;
-				$line .= $row['grids_edit'].delimiter;
-				$line .= $row['grid_subtitle1'].delimiter;
-				$line .= $row['grid_subtitle2'].delimiter;
-				$line .= $row['ranking_k'].delimiter;
-				$line .= $row['vsota'].delimiter;
-				$line .= $row['vsota_limit'].delimiter;
-				$line .= $row['vsota_min'].delimiter;
-				$line .= $row['skala'].delimiter;
-				$line .= $row['vsota_reminder'].delimiter;
-				$line .= $row['vsota_limittype'].delimiter;
-				$line .= $row['vsota_show'].delimiter;
-				$line .= $row['thread'].delimiter;
-				$line .= $row['text_kosov'].delimiter;
-				$line .= $row['text_orientation'].delimiter;
-				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['note']) ).delimiter;
-				$line .= $row['upload'].delimiter;
-				$line .= $row['dostop'].delimiter;
-				$line .= $row['inline_edit'].delimiter;
-				$line .= $row['onchange_submit'].delimiter;
-				$line .= $row['hidden_default'].delimiter;
-				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['naslov_graf']) ).delimiter;
-				$line .= $row['edit_graf'].delimiter;
-				$line .= $row['wide_graf'].delimiter;
-				$line .= $row['coding'].delimiter;
-				$line .= $row['dynamic_mg'].delimiter;
-				
-				$sql1 = sisplet_query("SELECT f.* FROM srv_branching b, srv_if f WHERE b.element_spr = '$row[id]' AND b.parent=f.id");
-				$row1 = mysqli_fetch_array($sql1);
-				$line .= $this->parentIf($id, $row1['id']).delimiter;*/
+
+				$line .= $row['char_count'].delimiter;
 	
 				fwrite($fd, $line."\r\n");
 			}
 		}
 		
+
 		fclose($fd);
 	}
 	
@@ -778,33 +680,24 @@ class SurveyKakovost{
 	
 		$fd = fopen($temp_folder.'/items_'.$this->anketa.'.csv', "w");
 	
+
 		// Prva vrstica
 		$output = '';
 		$output .= 'ID SURVEY'.delimiter;
 		$output .= 'ID QUESTION'.delimiter;
 		$output .= 'ID ITEM'.delimiter;
-		
-		/*$output .= 'naslov'.delimiter;
-		$output .= 'naslov2'.delimiter;*/
-		$output .= 'variable'.delimiter;
+
+        $output .= 'variable'.delimiter;
 		$output .= 'variable_custom'.delimiter;
 		$output .= 'vrstni_red'.delimiter;
-		/*$output .= 'random'.delimiter;
-		$output .= 'other'.delimiter;
-		$output .= 'if_id'.delimiter;
-		$output .= 'size'.delimiter;
-		$output .= 'naslov_graf'.delimiter;
-		
-		$output .= 'grid_vrstni_red'.delimiter;
-		$output .= 'grid_variable'.delimiter;
-		$output .= 'grid_other'.delimiter;
-		$output .= 'grid_naslov'.delimiter;*/
+
+		$output .= 'char_count'.delimiter;
 
 		fwrite($fd, $output."\r\n");
 		
 			
 		// Vrstice s podatki
-		$sql = sisplet_query("SELECT v.id, v.spr_id, v.variable, v.variable_custom, v.vrstni_red 
+		$sql = sisplet_query("SELECT v.id, v.spr_id, v.variable, v.variable_custom, v.vrstni_red, CHAR_LENGTH(v.naslov) AS char_count
 								FROM srv_vrednost v, srv_spremenljivka s, srv_grupa g 
 								WHERE v.spr_id=s.id AND s.gru_id=g.id AND g.ank_id='".$this->anketa."' 
 								ORDER BY g.vrstni_red, s.vrstni_red");
@@ -819,30 +712,17 @@ class SurveyKakovost{
 				$line .= $row['spr_id'].delimiter;
 				$line .= $row['id'].delimiter;
 
-				/*$line .= str_replace("\n", '', str_replace(delimiter, '', $row['naslov']) ).delimiter;
-				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['naslov2']) ).delimiter;*/
 				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['variable']) ).delimiter;
 				$line .= $row['variable_custom'].delimiter;
 				$line .= $row['vrstni_red'].delimiter;
-				/*$line .= $row['random'].delimiter;
-				$line .= $row['other'].delimiter;
-				$line .= $row['if_id'].delimiter;
-				$line .= $row['size'].delimiter;
-				$line .= str_replace("\n", '', str_replace(delimiter, '', $row['naslov_graf']) ).delimiter;
-				
-				$sql1 = sisplet_query("SELECT * FROM srv_grid WHERE spr_id = '$row[spr_id]' ORDER BY vrstni_red ASC");
-				while ($row1 = mysqli_fetch_array($sql1)) {
-					
-					$line .= str_replace("\n", '', str_replace(delimiter, '', $row1['vrstni_red']) ).delimiter;
-					$line .= str_replace("\n", '', str_replace(delimiter, '', $row1['variable']) ).delimiter;
-					$line .= str_replace("\n", '', str_replace(delimiter, '', $row1['other']) ).delimiter;
-					$line .= str_replace("\n", '', str_replace(delimiter, '', $row1['naslov']) ).delimiter;
-				}*/
+
+				$line .= $row['char_count'].delimiter;
 				
 				fwrite($fd, $line."\r\n");
 			}
 		}
 		
+
 		fclose($fd);
 	}