diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php
index 828b66e450..4533254625 100644
--- a/module/datatable/view/ajaxcustom.html.php
+++ b/module/datatable/view/ajaxcustom.html.php
@@ -194,8 +194,7 @@ $(function()
             return sets;
         }).get();
 
-        //window.saveDatatableConfig('<?php echo $mode == 'table' ? 'tablecols' : 'cols';?>', setting, true, $('#global1').prop('checked') ? 1 : 0);
-        window.saveDatatableConfig('<?php echo 'cols';?>', setting, true, $('#global1').prop('checked') ? 1 : 0);
+        window.saveDatatableConfig('<?php echo $mode == 'table' ? 'tablecols' : 'cols';?>', setting, true, $('#global1').prop('checked') ? 1 : 0);
     });
 
     $('#resetBtn').on("click", function()
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 7ec9947804..4834d2d99d 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -35,15 +35,15 @@
     <?php $queryParam = strpos($menuItem->name, 'QUERY') === 0 ? '&param=' . (int)substr($menuItem->name, 5) : '';?>
     <?php if($menuItem->name == 'more'):?>
     <?php
-        echo '<div class="btn-group">';
-        echo html::a('javascript:;', $menuItem->text . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
-        echo "<ul class='dropdown-menu'>";
-        foreach ($lang->product->moreSelects as $key => $value)
-        {
-            echo '<li' . ($key == $this->session->storyBrowseType ? " class='active'" : '') . '>';
-            echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$key" . $queryParam), $value);
-        }
-        echo '</ul></div>';
+    echo '<div class="btn-group">';
+    echo html::a('javascript:;', $menuItem->text . " <span class='caret'></span>", '', "data-toggle='dropdown' class='btn btn-link'");
+    echo "<ul class='dropdown-menu'>";
+    foreach ($lang->product->moreSelects as $key => $value)
+    {
+        echo '<li' . ($key == $this->session->storyBrowseType ? " class='active'" : '') . '>';
+        echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$key" . $queryParam), $value);
+    }
+    echo '</ul></div>';
     ?>
     <?php else:?>
     <?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType" . $queryParam), "<span class='text'>$menuItem->text</span>" . ($menuItem->name == $this->session->storyBrowseType ? ' <span class="label label-light label-badge">' . $pager->recTotal . '</span>' : ''), '', "id='{$menuItem->name}Tab' class='btn btn-link" . ($this->session->storyBrowseType == $menuItem->name ? ' btn-active-text' : '') . "'");?>
@@ -109,7 +109,6 @@
       $vars         = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
 
       if($useDatatable) include '../../common/view/datatable.html.php';
-      if(!$useDatatable) include '../../common/view/tablesorter.html.php';
       $setting = $this->datatable->getSetting('product');
       $widths  = $this->datatable->setFixedFieldWidth($setting);
       $columns = 0;
diff --git a/module/todo/control.php b/module/todo/control.php
index 52523ee656..be605d5de5 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -481,9 +481,10 @@ class todo extends control
             foreach($todos as $todo)
             {
                 /* fill some field with useful value. */
+                $todo->begin = $todo->begin == '2400' ? '' : (isset($times[$todo->begin]) ? $times[$todo->begin] : $todo->begin);
+                $todo->end   = $todo->end   == '2400' ? '' : (isset($times[$todo->end])   ? $times[$todo->end] : $todo->end);
+
                 if(isset($users[$todo->account]))               $todo->account = $users[$todo->account];
-                if(isset($times[$todo->begin]))                 $todo->begin   = $times[$todo->begin];
-                if(isset($times[$todo->end]))                   $todo->end     = $times[$todo->end];
                 if($todo->type == 'bug')                        $todo->name    = isset($bugs[$todo->idvalue])  ? $bugs[$todo->idvalue] . "(#$todo->idvalue)" : '';
                 if($todo->type == 'task')                       $todo->name    = isset($tasks[$todo->idvalue]) ? $tasks[$todo->idvalue] . "(#$todo->idvalue)" : '';
                 if(isset($todoLang->typeList[$todo->type]))     $todo->type    = $todoLang->typeList[$todo->type];