diff --git a/module/testcase/control.php b/module/testcase/control.php
index 457986003a..7dddc2cc14 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1118,8 +1118,6 @@ class testcase extends control
 
             foreach($cases as $case)
             {
-                $case->title = htmlspecialchars_decode($case->title);
-
                 $relatedModuleIdList[$case->module] = $case->module;
                 $relatedStoryIdList[$case->story]   = $case->story;
                 $relatedCaseIdList[$case->linkCase] = $case->linkCase;
@@ -1162,8 +1160,8 @@ class testcase extends control
                         }
                         if($step->version != $case->version) continue;
                         $sign = (in_array($this->post->fileType, array('html', 'xml'))) ? '<br />' : "\n";
-                        $case->stepDesc   .= $stepId . ". " . htmlspecialchars_decode($step->desc) . $sign;
-                        $case->stepExpect .= $stepId . ". " . htmlspecialchars_decode($step->expect) . $sign;
+                        $case->stepDesc   .= $stepId . ". " . $step->desc . $sign;
+                        $case->stepExpect .= $stepId . ". " . $step->expect . $sign;
                         $childId ++;
                     }
                 }
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 41f9e6d163..a43dffa96c 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -541,13 +541,15 @@ class testcaseModel extends model
         else
         {
             /* Compare every step. */
+            $i = 0;
             foreach($oldCase->steps as $key => $oldStep)
             {
-                if(trim($oldStep->desc) != trim($steps[$key]['desc']) or trim($oldStep->expect) != $steps[$key]['expect']) 
+                if(trim($oldStep->desc) != trim($steps[$i]['desc']) or trim($oldStep->expect) != $steps[$i]['expect']) 
                 {
                     $stepChanged = true;
                     break;
                 }
+                $i++;
             }
         }
         $version = $stepChanged ? $oldCase->version + 1 : $oldCase->version;
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index a240f2f97d..a0736b8f2b 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -119,7 +119,7 @@
       <div class='actions'><?php echo $actionLinks;?></div>
       <fieldset id='commentBox' class='hide'>
         <legend><?php echo $lang->comment;?></legend>
-        <form method='post' action='<?php echo $this->creatLink('action', 'comment', "objectType=case&objectID=$case->id")?>' target='hiddenwin'>
+        <form method='post' action='<?php echo $this->createLink('action', 'comment', "objectType=case&objectID=$case->id")?>' target='hiddenwin'>
           <div class="form-group"><?php echo html::textarea('comment', '',"rows='5' class='w-p100'");?></div>
           <?php echo html::submitButton() . html::backButton();?>
         </form>