diff --git a/module/block/control.php b/module/block/control.php
index 9378ba0f6d..272a454181 100644
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -1750,7 +1750,7 @@ class block extends control
             $today = helper::today();
             $now   = date('H:i:s', strtotime(helper::now()));
 
-            $meetings = $this->dao->select('*')->from(TABLE_MEETING)
+            $stmt = $this->dao->select('*')->from(TABLE_MEETING)
                 ->Where('deleted')->eq('0')
                 ->andWhere('(date')->gt($today)
                 ->orWhere('(begin')->gt($now)
@@ -1759,9 +1759,10 @@ class block extends control
                 ->andwhere('(host')->eq($this->app->user->account)
                 ->orWhere('participant')->in($this->app->user->account)
                 ->markRight(1)
-                ->orderBy('id_desc')
-                ->beginIF(isset($params->meetingNum))->limit($params->meetingNum)
-                ->fetchAll();
+                ->orderBy('id_desc');
+
+            if(isset($params->meetingNum)) $stmt->limit($params->meetingNum);
+            $meetings = $stmt->fetchAll();
 
             $count['meeting'] = count($meetings);
             $this->view->meetings = $meetings;
@@ -1832,6 +1833,8 @@ class block extends control
 
         /* Get projects. */
         $this->app->loadLang('task');
+        $this->app->loadLang('program');
+        $this->app->loadLang('execution');
         $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $status, $orderBy, $count);
     }
 
diff --git a/module/bug/css/edit.css b/module/bug/css/edit.css
index 36613d69d7..7f63e63266 100644
--- a/module/bug/css/edit.css
+++ b/module/bug/css/edit.css
@@ -5,3 +5,4 @@
 .chosen-choices li.search-choice {word-break: break-all;}
 #linkBugBox > li {margin-left: -56px;}
 #branch {width: 95px;}
+#storyIdBox .chosen-auto-max-width {width: 215px !important;}
diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php
index 66c6b83b16..f1b357891f 100644
--- a/module/group/view/privbygroup.html.php
+++ b/module/group/view/privbygroup.html.php
@@ -38,7 +38,7 @@
         <th class='text-right'></th>
         <td class='form-actions'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'");?>
-          <?php echo html::backButton();?>
+          <?php echo html::a($this->inlink('browse'), $lang->goback, '', "class='btn btn-back btn-wide'");?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
         </td>
       </tr>
@@ -130,7 +130,7 @@
         </th>
         <td class='form-actions' colspan='2'>
           <?php echo html::submitButton('', "onclick='setNoChecked()'", 'btn btn-wide btn-primary');?>
-          <?php echo html::backButton();?>
+          <?php echo html::a($this->inlink('browse'), $lang->goback, '', "class='btn btn-back btn-wide'");?>
           <?php echo html::hidden('noChecked'); // Save the value of no checked.?>
         </td>
       </tr>
diff --git a/module/task/model.php b/module/task/model.php
index db89381a78..d3a749953f 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -192,7 +192,7 @@ class taskModel extends model
             }
 
             $teams = array();
-            if($this->post->multiple)
+            if($this->post->multiple and count(array_filter($this->post->team)) > 1)
             {
                 foreach($this->post->team as $row => $account)
                 {
@@ -897,7 +897,7 @@ class taskModel extends model
         $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->edit['id'], $this->post->uid);
 
         $teams = array();
-        if($this->post->multiple)
+        if($this->post->multiple and count(array_unique(array_filter($this->post->team))) > 1)
         {
             if(strpos(',done,closed,cancel,', ",{$task->status},") === false && $this->post->assignedTo && !in_array($this->post->assignedTo, $this->post->team))
             {
@@ -1216,7 +1216,7 @@ class taskModel extends model
         {
             if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime)));
             if($task->status == 'cancel') continue;
-            if($task->estStarted > $task->deadline) die(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall));
+            if(!empty($task->deadline) and $task->estStarted > $task->deadline) die(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall));
             foreach(explode(',', $this->config->task->edit->requiredFields) as $field)
             {
                 $field = trim($field);
@@ -3016,7 +3016,7 @@ class taskModel extends model
                 echo $this->lang->task->typeList[$task->type];
                 break;
             case 'status':
-                $storyChanged ? print("<span class='status-story status-changed'>{$this->lang->story->changed}</span>") : print("<span class='status-task status-{$task->status}'> " . $this->processStatus('task', $task) . "</span>");
+                $storyChanged ? print("<span class='status-story status-changed' title='{$this->lang->story->changed}'>{$this->lang->story->changed}</span>") : print("<span class='status-task status-{$task->status}' title='{$this->processStatus('task', $task)}'> " . $this->processStatus('task', $task) . "</span>");
                 break;
             case 'estimate':
                 echo round($task->estimate, 1) . $this->lang->execution->workHourUnit;
diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php
index 637ff9a981..f67a02544b 100755
--- a/module/task/view/batchedit.html.php
+++ b/module/task/view/batchedit.html.php
@@ -128,12 +128,12 @@ js::set('dittoNotice', $dittoNotice);
             <td class='text-left<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$taskID]", $taskMembers, $tasks[$taskID]->assignedTo, "class='form-control chosen' {$disableAssignedTo}");?></td>
             <td><?php echo html::select("types[$taskID]",    $typeList, $tasks[$taskID]->type, "class='form-control'");?></td>
             <td <?php echo zget($visibleFields, 'status',     "class='hidden'")?>><?php echo html::select("statuses[$taskID]", $statusList, $tasks[$taskID]->status, "class='form-control'");?></td>
-            <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarteds[$taskID]",     $tasks[$taskID]->estStarted, "class='form-control text-center form-date'");?></td>
-            <td <?php echo zget($visibleFields, 'deadline',   "class='hidden'")?>><?php echo html::input("deadlines[$taskID]",     $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?></td>
-            <td <?php echo zget($visibleFields, 'pri',        "class='hidden'")?>><?php echo html::select("pris[$taskID]",     $priList, $tasks[$taskID]->pri, "class='form-control'");?></td>
+            <td <?php echo zget($visibleFields, 'estStarted', "class='hidden'")?>><?php echo html::input("estStarteds[$taskID]", helper::isZeroDate($tasks[$taskID]->estStarted) ? '' : $tasks[$taskID]->estStarted, "class='form-control text-center form-date'");?></td>
+            <td <?php echo zget($visibleFields, 'deadline',   "class='hidden'")?>><?php echo html::input("deadlines[$taskID]", helper::isZeroDate($tasks[$taskID]->deadline) ? '' : $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?></td>
+            <td <?php echo zget($visibleFields, 'pri',        "class='hidden'")?>><?php echo html::select("pris[$taskID]", $priList, $tasks[$taskID]->pri, "class='form-control'");?></td>
             <td <?php echo zget($visibleFields, 'estimate',   "class='hidden'")?>><?php echo html::input("estimates[$taskID]", $tasks[$taskID]->estimate, "class='form-control text-center' {$disableHour}");?></td>
             <td <?php echo zget($visibleFields, 'record',     "class='hidden'")?>><?php echo html::input("consumeds[$taskID]", '', "class='form-control text-center' {$disableHour}");?></td>
-            <td <?php echo zget($visibleFields, 'left',       "class='hidden'")?>><?php echo html::input("lefts[$taskID]",     $tasks[$taskID]->left, "class='form-control text-center' {$disableHour}");?></td>
+            <td <?php echo zget($visibleFields, 'left',       "class='hidden'")?>><?php echo html::input("lefts[$taskID]", $tasks[$taskID]->left, "class='form-control text-center' {$disableHour}");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'finishedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("finishedBys[$taskID]", $members, $tasks[$taskID]->finishedBy, "class='form-control chosen'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'canceledBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("canceledBys[$taskID]", $members, $tasks[$taskID]->canceledBy, "class='form-control chosen'");?></td>
             <td class='text-left<?php echo zget($visibleFields, 'closedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("closedBys[$taskID]",   $members, $tasks[$taskID]->closedBy, "class='form-control chosen'");?></td>
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index e1931015f9..57ca6fd300 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -175,11 +175,11 @@
             <table class='table table-form'>
               <tr>
                 <th class='thWidth'><?php echo $lang->task->estStarted;?></th>
-                <td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td>
+                <td><?php echo html::input('estStarted', helper::isZeroDate($task->estStarted) ? '' : $task->estStarted, "class='form-control form-date'");?></td>
               </tr>
               <tr>
                 <th><?php echo $lang->task->deadline;?></th>
-                <td><?php echo html::input('deadline', $task->deadline, "class='form-control form-date'");?></td>
+                <td><?php echo html::input('deadline', helper::isZeroDate($task->deadline) ? '' : $task->deadline, "class='form-control form-date'");?></td>
               </tr>
               <tr>
                 <th><?php echo $lang->task->estimate;?></th>
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 079e646c00..a7e2f92673 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -636,6 +636,7 @@ class testtask extends control
         $this->app->loadLang('execution');
         $this->app->loadLang('task');
         $this->session->set('caseList', $this->app->getURI(true), 'qa');
+        setcookie('taskCaseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         /* Get task and product info, set menu. */
         $groupBy = empty($groupBy) ? 'story' : $groupBy;
diff --git a/module/todo/control.php b/module/todo/control.php
index 3e3201e198..8335be389d 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -345,7 +345,7 @@ class todo extends control
         }
 
         $this->view->todo    = $this->todo->getById($todoID);
-        $this->view->members = $this->loadModel('user')->getPairs();
+        $this->view->members = $this->loadModel('user')->getPairs('noclosed');
         $this->view->times   = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
         $this->view->time    = date::now();
         $this->display();