diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 09e24a8c34..1dc1b30fb6 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -296,15 +296,18 @@ function runAutocase()
     var url = createLink('zanode', 'ajaxRunZTFScript', 'scriptID=' + automation)
 
     var postData = {'caseIDList' : caseIDList.join(',')};
+
+    var response = true;
     $.post(url, postData, function(result)
     {
         if(result.result == 'fail')
         {
             alert(result.message);
-            return false;
+            response = false;
         }
-        return true;
     }, 'json');
+
+    return response;
 }
 
 function confirmAction(obj)
diff --git a/module/testsuite/view/view.html.php b/module/testsuite/view/view.html.php
index 03625f8e87..9bae44a8a8 100644
--- a/module/testsuite/view/view.html.php
+++ b/module/testsuite/view/view.html.php
@@ -176,15 +176,17 @@ function runAutocase()
     var url = createLink('zanode', 'ajaxRunZTFScript', 'scriptID=' + automation)
 
     var postData = {'caseIDList' : caseIDList.join(',')};
+
+    var response = true;
     $.post(url, postData, function(result)
     {
         if(result.result == 'fail')
         {
             alert(result.message);
-            return false;
+            response = false;
         }
-        return true;
     }, 'json');
+    return response;
 }
 
 function confirmAction(obj)
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 87d6e331dd..3d3eb21b60 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -1381,7 +1381,13 @@ class testtask extends control
 
         /* Set modules. */
         $moduleOptionMenu = array(0 => '/');
-        foreach($cases as $case) $moduleOptionMenu += $this->tree->getModulesName($case->module);
+        foreach($cases as $caseID => $case)
+        {
+            if($case->auto == 'auto' and $confirm == 'yes') unset($cases[$caseID]);
+            $moduleOptionMenu += $this->tree->getModulesName($case->module);
+        }
+        if(empty($cases)) return print(js::locate($url));
+
         $this->view->moduleOptionMenu = $moduleOptionMenu;
 
         /* If case has changed and not confirmed, remove it. */
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index 922df9f8fa..dfbe67909d 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -39,11 +39,7 @@
         <td class='text-left wordwrap'><?php echo "<span title='{$case->title}'>{$case->title}</span>"?></td>
         <td class='text-left precondition wordwrap'><?php echo "<span title='{$case->precondition}'>{$case->precondition}</span>"?></td>
         <td class='text-left'>
-        <?php if($confirm == 'yes'):?>
-          <?php echo html::hidden("results[$caseID]", '');?>
-        <?php else:?>
           <?php echo html::radio("results[$caseID]", $this->lang->testcase->resultList, 'pass', "onclick='showAction(this.value,\".action$caseID\")'", 'block')?>
-        <?php endif;?>
         </td>
         <td>
           <?php if(!empty($steps[$caseID])):?>
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php
index 5f590ad068..5d4426da76 100644
--- a/module/testtask/view/cases.html.php
+++ b/module/testtask/view/cases.html.php
@@ -177,15 +177,18 @@ function runAutocase()
     var url = createLink('zanode', 'ajaxRunZTFScript', 'scriptID=' + automation)
 
     var postData = {'caseIDList' : caseIDList.join(',')};
+
+    var response = true;
     $.post(url, postData, function(result)
     {
         if(result.result == 'fail')
         {
             alert(result.message);
-            return false;
+            response = false;
         }
-        return true;
     }, 'json');
+
+    return response;
 }
 
 function confirmAction(obj)
diff --git a/module/zanode/model.php b/module/zanode/model.php
index 4338985ded..d2daa65171 100644
--- a/module/zanode/model.php
+++ b/module/zanode/model.php
@@ -736,7 +736,7 @@ class zanodemodel extends model
         );
 
         $result = json_decode(commonModel::http("http://{$node->ip}:{$node->ztf}/api/v1/jobs/add", json_encode($params), array(), array("Authorization:$node->tokenSN")));
-        if(empty($result->data) || $result->code != 0)
+        if($result->code != 0)
         {
             $this->dao->delete()->from(TABLE_TESTRESULT)->where('id')->eq($task)->exec();
             return  dao::$errors = $this->lang->zanode->runTimeout;