diff --git a/module/testcase/ui/create.field.php b/module/testcase/ui/create.field.php
index 3717b1945e..732d926119 100644
--- a/module/testcase/ui/create.field.php
+++ b/module/testcase/ui/create.field.php
@@ -48,7 +48,7 @@ $fields->field('scriptFile')
     ->width('full')
     ->label($lang->testcase->autoScript)
     ->className('autoScript')
-    ->hidden(data('case.auto') != 'auto')
+    ->hidden(data('case.auto') != 'auto' && !data('onlyAutoCase'))
     ->control('fileSelector', array('accept' => $config->testcase->scriptAcceptFileTypes, 'multiple' => false, 'maxFileCount' => 1, 'onAdd' => jsRaw('window.readScriptContent'), 'onRemove' => jsRaw('window.showUploadScriptBtn')));
 
 $fields->field('script')
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index f2dc867dd8..fc2e3232dd 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -339,14 +339,15 @@ class testsuite extends control
         if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
         $this->loadModel('search')->setSearchParams($this->config->testcase->search);
 
-        $this->view->title     = $suite->name . $this->lang->colon . $this->lang->testsuite->linkCase;
-        $this->view->users     = $this->loadModel('user')->getPairs('noletter');
-        $this->view->cases     = $this->testsuite->getUnlinkedCases($suite, $browseType, $param, $pager);
-        $this->view->suiteID   = $suiteID;
-        $this->view->param     = $param;
-        $this->view->pager     = $pager;
-        $this->view->suite     = $suite;
-        $this->view->productID = $productID;
+        $this->view->title      = $suite->name . $this->lang->colon . $this->lang->testsuite->linkCase;
+        $this->view->users      = $this->loadModel('user')->getPairs('noletter');
+        $this->view->cases      = $this->testsuite->getUnlinkedCases($suite, $browseType, $param, $pager);
+        $this->view->suiteID    = $suiteID;
+        $this->view->param      = $param;
+        $this->view->pager      = $pager;
+        $this->view->suite      = $suite;
+        $this->view->productID  = $productID;
+        $this->view->browseType = $browseType;
         $this->display();
     }
 
diff --git a/module/testsuite/ui/linkcase.html.php b/module/testsuite/ui/linkcase.html.php
index cf20a02df6..9c38a8317b 100644
--- a/module/testsuite/ui/linkcase.html.php
+++ b/module/testsuite/ui/linkcase.html.php
@@ -20,7 +20,7 @@ featureBar
             entityLabel(set(array('entityID' => $suite->id, 'level' => 3, 'text' => $suite->name))),
             icon('angle-right'),
             $lang->testsuite->linkCase,
-            li(searchToggle(set::open(true)))
+            li(searchToggle(set::open($browseType == 'bySearch')))
         )
     )
 );