diff --git a/admin/operatorquestionnaire.php b/admin/operatorquestionnaire.php
index b6c5cc93..87391409 100644
--- a/admin/operatorquestionnaire.php
+++ b/admin/operatorquestionnaire.php
@@ -159,7 +159,7 @@ xhtml_head(T_("Assign operators to questionnaires"),true,array("../include/boots
 print "questionnaire_id = new Array(";
 
 $s = "";
-
+$q = array();
 foreach($questionnaires as $q)
 {
 	$s .= "'{$q['questionnaire_id']}',";
@@ -246,7 +246,7 @@ foreach($questionnaires as $q)
 }
 print "</tr></thead>";
 
-
+$v = array();
 foreach($operators as $v)
 {
 
diff --git a/admin/samplelist.php b/admin/samplelist.php
index 3acd3f08..1ed9721b 100644
--- a/admin/samplelist.php
+++ b/admin/samplelist.php
@@ -288,17 +288,17 @@ if (isset($_GET['edit']) )
 	$sql = "SELECT * FROM sample_import WHERE sample_import_id = $sample_import_id";
 	$sd = $db->GetRow($sql);
 	
-	if($sd['enabled'] == 1) $dis = disabled; // -> disable edit and delete if sample is enabled
+	if($sd['enabled'] == 1) $dis = "disabled"; else $dis = false;// -> disable edit and delete if sample is enabled
 
 	$sql = "SELECT type, description
 		FROM sample_var_type";
 	$rd = $db->GetAll($sql);
-	
+		$selected = "selected=\"selected\"";	
 	$sql = "SELECT sir.var_id, 
 		CONCAT('<input type=\"text\" onInput=\"$(this).attr(\'name\',\'var[',sir.var_id,']\');\"  value=\"' ,sir.var, '\" required class=\"form-control\" style=\"min-width: 300px;\" $dis />') as var, 
 		CONCAT ('<select name=\"type[',sir.var_id,']\" class=\"form-control\" $dis >
 		<option value=\"' ,svt.type, '\" $selected>' ,svt.description, '</option>";
-		$selected = "selected=\"selected\"";
+
 			foreach($rd as $r)
 			{	
 					$sql .= "<option value=\"{$r['type']}\">" . T_($r['description']) . "</option>";
diff --git a/functions/functions.xhtml.php b/functions/functions.xhtml.php
index 1eac9221..09cfd404 100644
--- a/functions/functions.xhtml.php
+++ b/functions/functions.xhtml.php
@@ -114,7 +114,7 @@ function xhtml_foot($javascript = false){		//added javascript files array to the
  */
 function xhtml_table($content,$fields,$head = false,$class = "tclass",$highlight=false,$total=false,$id=false,$name=false)
 {
-	$tot = array();
+	$tot = array(); $row = array();
 	if ($class == "tclass") $class = "table-hover table-bordered table-condensed tclass";
 	print "<table class=\"$class\" id=\"$id\" name=\"$name\" data-toggle=\"table\" data-toolbar=\"filter-bar\" data-show-filter=\"true\" >";
 	if ($head)