diff --git a/module/testcase/control.php b/module/testcase/control.php
index d4cb58a483..3aec963670 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -216,7 +216,7 @@ class testcase extends control
         $this->view->browseType      = $browseType;
         $this->view->param           = $param;
         $this->view->cases           = $cases;
-        $this->view->branch          = $branch;
+        $this->view->branch          = $product->type == 'normal' ? 0 : $branch;
         $this->view->branchOption    = $branchOption;
         $this->view->branchTagOption = $branchTagOption;
         $this->view->suiteList       = $this->loadModel('testsuite')->getSuites($productID);
@@ -1942,12 +1942,6 @@ class testcase extends control
             }
             unset($rows[0]);
 
-            foreach($header as $title)
-            {
-                if(!isset($fields[$title])) continue;
-                $columnKey[] = $fields[$title];
-            }
-
             $endField = end($fields);
             $caseData = array();
             $stepData = array();
@@ -1955,8 +1949,11 @@ class testcase extends control
             foreach($rows as $row => $data)
             {
                 $case = new stdclass();
-                foreach($columnKey as $key => $field)
+                foreach($header as $key => $title)
                 {
+                    if(!isset($fields[$title])) continue;
+                    $field = $fields[$title];
+
                     if(!isset($data[$key])) continue;
                     $cellValue = $data[$key];
                     if($field == 'story' or $field == 'module' or $field == 'branch')
diff --git a/module/testcase/model.php b/module/testcase/model.php
index b1aac04082..1158b7b9b7 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1232,7 +1232,7 @@ class testcaseModel extends model
             $cases[$key] = $caseData;
             $line++;
         }
-        if(dao::isError()) return print(js::error(dao::getError()));
+        if(dao::isError()) return false;
 
         $forceNotReview = $this->forceNotReview();
         foreach($cases as $key => $caseData)
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 6927be6b07..2ca6320c31 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -138,9 +138,10 @@
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></button>
       <ul class='dropdown-menu pull-right' id='importActionMenu'>
       <?php
-      $class = common::hasPriv('testcase', 'import') ? '' : "class=disabled";
-      $misc  = common::hasPriv('testcase', 'import') ? "class='export'" : "class=disabled";
-      $link  = common::hasPriv('testcase', 'import') ?  $this->createLink('testcase', 'import', "productID=$productID&branch=$branch") : '#';
+      $printImportBtn = (common::hasPriv('testcase', 'import') and $branch !== 'all') ? true : false;
+      $class = $printImportBtn ? '' : "class=disabled";
+      $misc  = $printImportBtn ? "class='export'" : "class=disabled";
+      $link  = $printImportBtn ?  $this->createLink('testcase', 'import', "productID=$productID&branch=$branch") : '#';
       echo "<li $class>" . html::a($link, $lang->testcase->fileImport, '', $misc . "data-app={$this->app->tab}") . "</li>";
 
       $class = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 636397f18e..5ff2178510 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -32,11 +32,11 @@ $(function()
         <tr>
           <th class='c-line-number'><?php echo $lang->lineNumber?></th>
           <th class='c-id'><?php echo $lang->idAB?></th>
-          <th><?php echo $lang->testcase->title?></th>
+          <th class='required'><?php echo $lang->testcase->title?></th>
           <th class='c-module'><?php echo $lang->testcase->module?></th>
           <th class='c-story'><?php echo $lang->testcase->story?></th>
           <th class='c-pri-box'><?php echo $lang->testcase->pri?></th>
-          <th class='c-type'><?php echo $lang->testcase->type?></th>
+          <th class='c-type required'><?php echo $lang->testcase->type?></th>
           <th class='c-stage'><?php echo $lang->testcase->stage?></th>
           <th><?php echo $lang->testcase->precondition?></th>
           <?php if(!empty($appendFields)):?>
@@ -62,7 +62,7 @@ $(function()
         <?php foreach($caseData as $key => $case):?>
         <?php if(empty($case->title)) continue;?>
         <tr valign='top' class='text-left'>
-          <td><?php echo $key;?></td>
+          <td><?php echo $addID;?></td>
           <td>
             <?php
             if(!empty($case->id))
@@ -75,7 +75,13 @@ $(function()
                 echo "<sub class='gray' style='vertical-align:sub;'>{$lang->testcase->new}</sub>";
             }
             echo html::hidden("product[$key]", $productID);
-            if(!empty($branches)) echo html::hidden("branch[$key]", !empty($case->branch) ? $case->branch : ((!empty($case->id) and isset($cases[$case->id]) and !empty($cases[$case->id]->branch)) ? $cases[$case->id]->branch : $branch));
+            if(!empty($branches))
+            {
+                $branchID = $branch;
+                if(isset($case->branch)) $branchID = $case->branch;
+                if(!empty($case->id) and !empty($cases[$case->id]->branch)) $branchID = $cases[$case->id]->branch;
+                echo html::hidden("branch[$key]", $branchID);
+            }
             echo html::hidden("keywords[$key]", isset($case->keywords) ? $case->keywords : "");
             ?>
           </td>
@@ -100,14 +106,23 @@ $(function()
           <td>
             <?php if(isset($stepData[$key]['desc'])):?>
             <table class='w-p100 bd-0'>
+            <?php $hasStep = false;?>
             <?php foreach($stepData[$key]['desc'] as $id => $desc):?>
             <?php if(empty($desc['content'])) continue;?>
               <tr class='step'>
+                <?php $hasStep = true;?>
                 <td><?php echo $id . html::hidden("stepType[$key][$id]", $desc['type'])?></td>
                 <td><?php echo html::textarea("desc[$key][$id]", htmlSpecialString($desc['content']), "class='form-control'")?></td>
                 <td><?php if($desc['type'] != 'group') echo html::textarea("expect[$key][$id]", isset($stepData[$key]['expect'][$id]['content']) ? htmlSpecialString($stepData[$key]['expect'][$id]['content']) : '', "class='form-control'")?></td>
               </tr>
             <?php endforeach;?>
+            <?php if(!$hasStep):?>
+              <tr class='step'>
+                <td><?php echo '1' . html::hidden("stepType[$key][1]", 'step')?></td>
+                <td><?php echo html::textarea("desc[$key][1]", '', "class='form-control'")?></td>
+                <td><?php echo html::textarea("expect[$key][1]", '', "class='form-control'")?></td>
+              </tr>
+            <?php endif;?>
             </table>
             <?php else:?>
             <table class='w-p100 bd-0'>
@@ -120,6 +135,7 @@ $(function()
             <?php endif;?>
           </td>
         </tr>
+        <?php $addID ++;?>
         <?php endforeach;?>
       </tbody>
       <tfoot>