diff --git a/module/caselib/model.php b/module/caselib/model.php
index 5496c47c43..cdbfd1e1e6 100644
--- a/module/caselib/model.php
+++ b/module/caselib/model.php
@@ -455,7 +455,6 @@ class caselibModel extends model
             {
                 $caseID      = $data->id[$key];
                 $stepChanged = false;
-                $steps       = array();
                 $oldStep     = isset($oldSteps[$caseID]) ? $oldSteps[$caseID] : array();
                 $oldCase     = $oldCases[$caseID];
 
@@ -469,8 +468,8 @@ class caselibModel extends model
                         if(empty($desc)) continue;
                         $step = new stdclass();
                         $step->type   = $data->stepType[$key][$id];
-                        $step->desc   = $desc;
-                        $step->expect = trim($data->expect[$key][$id]);
+                        $step->desc   = htmlspecialchars($desc);
+                        $step->expect = htmlspecialchars(trim($data->expect[$key][$id]));
 
                         $steps[] = $step;
                     }
@@ -552,8 +551,8 @@ class caselibModel extends model
                         $stepData->parent  = ($stepData->type == 'item') ? $parentStepID : 0;
                         $stepData->case    = $caseID;
                         $stepData->version = 1;
-                        $stepData->desc    = $desc;
-                        $stepData->expect  = $data->expect[$key][$id];
+                        $stepData->desc    = htmlspecialchars($desc);
+                        $stepData->expect  = htmlspecialchars(trim($data->expect[$key][$id]));
                         $this->dao->insert(TABLE_CASESTEP)->data($stepData)->autoCheck()->exec();
                         if($stepData->type == 'group') $parentStepID = $this->dao->lastInsertID();
                         if($stepData->type == 'step')  $parentStepID = 0;
diff --git a/module/caselib/view/showimport.html.php b/module/caselib/view/showimport.html.php
index 26d2059e6e..1ca441c346 100644
--- a/module/caselib/view/showimport.html.php
+++ b/module/caselib/view/showimport.html.php
@@ -109,9 +109,9 @@ $(function()
             {
               echo html::submitButton($submitText);
               if($dataInsert !== '') echo html::hidden('insert', $dataInsert);
-              echo html::hidden('isEndPage', $isEndPage ? 1 : 0);
-              echo html::hidden('pagerID', $pagerID);
             }
+            echo html::hidden('isEndPage', $isEndPage ? 1 : 0);
+            echo html::hidden('pagerID', $pagerID);
             echo '   ' . html::backButton();
             echo '   ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager);
             ?>
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 24d3f89657..625961f4e2 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1145,7 +1145,6 @@ class testcaseModel extends model
             if($caseID)
             {
                 $stepChanged = false;
-                $steps       = array();
                 $oldStep     = isset($oldSteps[$caseID]) ? $oldSteps[$caseID] : array();
                 $oldCase     = $oldCases[$caseID];
 
@@ -1159,8 +1158,8 @@ class testcaseModel extends model
                         if(empty($desc)) continue;
                         $step = new stdclass();
                         $step->type   = $data->stepType[$key][$id];
-                        $step->desc    = htmlspecialchars($desc);
-                        $step->expect  = htmlspecialchars(trim($this->post->expect[$key][$id]));
+                        $step->desc   = htmlspecialchars($desc);
+                        $step->expect = htmlspecialchars(trim($this->post->expect[$key][$id]));
 
                         $steps[] = $step;
                     }
@@ -1208,8 +1207,8 @@ class testcaseModel extends model
                             $stepData->parent  = ($stepData->type == 'item') ? $parentStepID : 0;
                             $stepData->case    = $caseID;
                             $stepData->version = $version;
-                            $stepData->desc    = htmlspecialchars($step['desc']);
-                            $stepData->expect  = htmlspecialchars($step['expect']);
+                            $stepData->desc    = $step['desc'];
+                            $stepData->expect  = $step['expect'];
                             $this->dao->insert(TABLE_CASESTEP)->data($stepData)->autoCheck()->exec();
                             if($stepData->type == 'group') $parentStepID = $this->dao->lastInsertID();
                             if($stepData->type == 'step')  $parentStepID = 0;
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index c88d8a843f..c809409aae 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -134,9 +134,9 @@ $(function()
             {
                 echo html::submitButton($submitText);
                 if($dataInsert !== '') echo html::hidden('insert', $dataInsert);
-                echo html::hidden('isEndPage', $isEndPage ? 1 : 0);
-                echo html::hidden('pagerID', $pagerID);
             }
+            echo html::hidden('isEndPage', $isEndPage ? 1 : 0);
+            echo html::hidden('pagerID', $pagerID);
             echo '   ' . html::backButton();
             echo '   ' . sprintf($lang->file->importPager, $allCount, $pagerID, $allPager);
             ?>