diff --git a/module/task/control.php b/module/task/control.php
index 4cca9a1c84..c55055c2b1 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -789,7 +789,7 @@ class task extends control
 
         $task         = $this->view->task;
         $members      = $this->loadModel('project')->getTeamMemberPairs($task->project, 'nodeleted');
-        $task->nextBy = $task->assignedTo;
+        $task->nextBy = $task->openedBy;
 
         $this->view->users = $members;
         if(!empty($task->team))
diff --git a/module/task/css/batchcreate.css b/module/task/css/batchcreate.css
index d09664df48..108582d3fc 100644
--- a/module/task/css/batchcreate.css
+++ b/module/task/css/batchcreate.css
@@ -8,7 +8,9 @@
 .chosen-container[id^="story"] .chosen-drop {min-width: 450px;!important}
 .chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important}
 
-#zeroTaskStory{background-color: #fafafa; color: #808080; padding: 5px 8px; text-align: center; margin-left: 10px; border: 1px solid #ddd; }
+#zeroTaskStory{background-color: #fafafa; color: #808080; padding: 5px 8px; text-align: center; margin-left: 10px; border: 1px solid #ddd;}
 #zeroTaskStory .icon{display:none;}
-#zeroTaskStory.zeroTask {background-color: #114f8e; color: #fff; border-color: #114f8e; }
+#zeroTaskStory.zeroTask {background-color: #114f8e; color: #fff; border-color: #114f8e;}
 #zeroTaskStory.zeroTask .icon{display:inline;}
+
+.heading .pull-left {max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/task/view/batchcreate.html.php b/module/task/view/batchcreate.html.php
index 525059619a..2f85283b83 100644
--- a/module/task/view/batchcreate.html.php
+++ b/module/task/view/batchcreate.html.php
@@ -15,8 +15,16 @@
 <div id='titlebar'>
   <div class='heading'>
     <span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
-    <strong><small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small> <?php echo $isChildren ? $parentTitle . '&nbsp; ' . $lang->task->batchCreateChildren : $lang->task->batchCreate;?></strong>
-      <?php if($project->type != 'ops'):?><span><small><a href='javascript:toggleZeroTaskStory();' id='zeroTaskStory'><?php echo $lang->story->zeroTask;?><i class='icon icon-remove'></i></a></small></span><?php endif;?>
+    <strong>
+      <small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
+      <?php if($isChildren):?>
+      <span class='pull-left'><?php echo $parentTitle;?></span> 
+      <?php echo $lang->task->batchCreateChildren;?>
+      <?php else:?>
+      <?php echo $lang->task->batchCreate;?>
+      <?php endif;?>
+    </strong>
+    <?php if($project->type != 'ops'):?><span><small><a href='javascript:toggleZeroTaskStory();' id='zeroTaskStory'><?php echo $lang->story->zeroTask;?><i class='icon icon-remove'></i></a></small></span><?php endif;?>
     <div class='actions'>
       <?php echo html::commonButton($lang->pasteText, "data-toggle='myModal'", 'btn btn-primary')?>
       <button type="button" class="btn btn-default" data-toggle="customModal"><i class='icon icon-cog'></i> </button>
diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php
index 78a30bf7ff..74f5736fdc 100644
--- a/module/task/view/finish.html.php
+++ b/module/task/view/finish.html.php
@@ -38,7 +38,7 @@
     </tr>
     <tr>
       <th><?php echo empty($task->team) ? $lang->task->assign : $lang->task->transferTo;?></th>
-      <td><?php echo html::select('assignedTo', $members, $task->openedBy, "class='form-control chosen'");?></td><td></td>
+      <td><?php echo html::select('assignedTo', $members, $task->nextBy, "class='form-control chosen'");?></td><td></td>
     </tr>
     <tr>
       <th><?php echo $lang->task->finishedDate;?></th>
diff --git a/module/tree/model.php b/module/tree/model.php
index 5971b0c427..6cb96e74da 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1396,6 +1396,7 @@ class treeModel extends model
 
         $this->fixModulePath($module->root, $module->type);
 
+        if($module->type == 'line')  $this->dao->update(TABLE_PRODUCT)->set('line')->eq('0')->where('line')->eq($moduleID)->exec();
         if($module->type == 'task')  $this->dao->update(TABLE_TASK)->set('module')->eq($module->parent)->where('module')->in($childs)->exec();
         if($module->type == 'bug')   $this->dao->update(TABLE_BUG)->set('module')->eq($module->parent)->where('module')->in($childs)->exec();
         if($module->type == 'case')  $this->dao->update(TABLE_CASE)->set('module')->eq($module->parent)->where('module')->in($childs)->exec();
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index b3991c2d77..f4f85e542e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -211,6 +211,7 @@ class upgradeModel extends model
                 $this->execSQL($this->getUpgradeFile('9.8.1'));
                 $this->fixTaskAssignedTo();
                 $this->fixProjectClosedInfo();
+                $this->resetProductLine();
        }
 
         $this->deletePatch();
@@ -2231,4 +2232,17 @@ class upgradeModel extends model
         }
         return !dao::isError();
     }
+
+    /**
+     * Set the value of deleted product line to 0.
+     * 
+     * @access public
+     * @return bool
+     */
+    public function resetProductLine()
+    {
+        $deletedLines = $this->dao->select('id')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq('1')->fetchPairs();
+        $this->dao->update(TABLE_PRODUCT)->set('line')->eq(0)->where('line')->in($deletedLines)->exec();
+        return !dao::isError();
+    }
 }