diff --git a/call_interface2.php b/call_interface2.php
index 27227cda..65567369 100644
--- a/call_interface2.php
+++ b/call_interface2.php
@@ -478,8 +478,7 @@ switch($state)
 	//	print "<div class='status'>" . T_("Requires coding") . "</div>";
 		print "<form action='?' method='post'><div class=\"form-group\">";
 		display_outcomes(false,$call_attempt_id,$case_id);
-		print_r($rs);
-		if ($_POST['confirm']){
+		if (isset($_POST['confirm'])){
 			print "</div><input type='submit' class=\"btn btn-primary\" value=\"" . T_("Assign outcome") . "\" name='submit' id='submit'/></form>";
 		}
 		break;
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index c6ea6a1b..50fbea9d 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -1519,7 +1519,8 @@ function close_row_quota($questionnaire_sample_quota_row_id,$update = true)
   {
       $sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison
                FROM qsqr_sample
-               WHERE questionnaire_sample_quota_row_id = $questionnaire_sample_quota_row_id";
+               WHERE questionnaire_sample_quota_row_id = $questionnaire_sample_quota_row_id
+               AND exclude_var_id > 0";
 
       $rev = $db->GetAll($sql2);
       
@@ -1699,7 +1700,8 @@ function update_single_row_quota($qsqri,$case_id = false)
   //all variables to exclude for this row quota
   $sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison
            FROM qsqr_sample
-           WHERE questionnaire_sample_quota_row_id = $qsqri";
+           WHERE questionnaire_sample_quota_row_id = $qsqri
+           AND exclude_var_id > 0";
 
   $rev = $db->GetAll($sql2);
 
@@ -1953,7 +1955,8 @@ function update_quota_priorities($questionnaire_id)
 
 		$sql2 = "SELECT exclude_val,exclude_var,exclude_var_id,comparison
              FROM qsqr_sample
-             WHERE questionnaire_sample_quota_row_id = $qsqri";
+             WHERE questionnaire_sample_quota_row_id = $qsqri
+             AND exclude_var_id > 0";
 
 		$rev = $db->GetAll($sql2);
 
diff --git a/index.php b/index.php
index 5e6e4f17..ea4b5bd8 100644
--- a/index.php
+++ b/index.php
@@ -112,7 +112,7 @@ if (isset($_GET['endcase']))
 	//if ($db->HasFailedTrans()) {print "<p>FAILED AT ENDCASE</p>"; exit();}
 }
 
-$js = array("js/popup.js","js/tabber.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js");
+$js = array("js/popup.js","js/tabber.js","include/jquery/jquery.min.js","include/jquery-ui/jquery-ui.min.js");
 $body = true;
 $script = "";
 if (AUTO_LOGOUT_MINUTES !== false)
diff --git a/index_interface2.php b/index_interface2.php
index 4762dfc2..c1706c12 100644
--- a/index_interface2.php
+++ b/index_interface2.php
@@ -159,7 +159,7 @@ if (isset($_GET['endcase']))
 
 }
 
-$js = array("js/popup.js","js/tabber.js","include/jquery/jquery-1.4.2.min.js","include/jquery-ui/jquery-ui.min.js");
+$js = array("js/popup.js","js/tabber.js","include/jquery/jquery.min.js","include/jquery-ui/jquery-ui.min.js");
 $body = true;
 $script = "";
 if (AUTO_LOGOUT_MINUTES !== false)
@@ -209,6 +209,7 @@ $sc = $scr['self_complete'];
 $ref = $scr['referral'];
 
 
+$availability = is_using_availability($case_id);
 ?>
 <div id="casefunctions" class="col-sm-2">
 <ul id="casefunctions" class="header ">
@@ -334,7 +335,6 @@ $ref = $scr['referral'];
 $ca = get_call_attempt($operator_id,true);
 $call_id = get_call($operator_id);
 $appointment = false;
-$availability = is_using_availability($case_id);
 if ($ca)
 {
 	$appointment = is_on_appointment($ca);
diff --git a/js/popup.js b/js/popup.js
index 2e17092b..e1390d91 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -3,14 +3,7 @@ function poptastic(url, title)
   var elem = jQuery("#inpage");
   if (elem.length > 0) {
     elem = jQuery(elem[0]);
-    if (elem.dialog("option", "title") == title) {
-      if (! elem.dialog("isOpen")) {
-	elem.dialog("open");
-      }
-      return;
-    } else {
-      elem.dialog("close").dialog("destroy").remove();
-    }
+    elem.dialog("close").dialog("destroy").remove();
   }
   jQuery('<iframe id="inpage" src="'+ url +'" />').dialog({
     autoOpen: true,