diff --git a/module/common/model.php b/module/common/model.php
index 26c6a19342..a5d06c7b27 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -416,10 +416,12 @@ class commonModel extends model
                     $link      = $lang->admin->subMenu->$subMenu->$type;
                     if(is_array($lang->admin->subMenu->$subMenu->$type))
                     {
-                        if(isset($lang->admin->subMenu->$subMenu->$type['subModule'])) $subModule = $lang->admin->subMenu->$subMenu->$type['subModule'];
-                        if(isset($lang->admin->subMenu->$subMenu->$type['alias'])) $alias = $lang->admin->subMenu->$subMenu->$type['alias'];
-                        $link = $lang->admin->subMenu->$subMenu->$type['link'];
+                        $subMenuType = $lang->admin->subMenu->$subMenu->$type;
+                        if(isset($subMenuType['subModule'])) $subModule = $subMenuType['subModule'];
+                        if(isset($subMenuType['alias']))     $alias     = $subMenuType['alias'];
+                        if(isset($subMenuType['link']))      $link      = $subMenuType['link'];
                     }
+
                     list($text, $currentModule, $currentMethod)= explode('|', $link);
                     if(!common::hasPriv($currentModule, $currentMethod)) continue;
 
diff --git a/module/doc/control.php b/module/doc/control.php
index 012847d16f..7f9492a930 100644
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -404,7 +404,7 @@ class doc extends control
         $this->view->doc              = $doc;
         $this->view->moduleOptionMenu = $this->tree->getOptionMenu($libID, 'doc', $startModuleID = 0);
         $this->view->type             = $type;
-        $this->view->libs             = $this->doc->getCompleteLibName();
+        $this->view->libs             = $this->doc->getLibs($type = 'all', $extra = 'withObject');
         $this->view->groups           = $this->loadModel('group')->getPairs();
         $this->view->users            = $this->user->getPairs('noletter', $doc->users);
         $this->display();
diff --git a/module/doc/model.php b/module/doc/model.php
index 4f5ff54510..2ac0e3ab96 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -157,10 +157,25 @@ class docModel extends model
                 ->orderBy('`order`, id desc')->query();
         }
 
+        if(strpos($extra, 'withObject') !== false)
+        {
+            $products = $this->loadModel('product')->getPairs();
+            $projects = $this->loadModel('project')->getPairs();
+        }
+
         $libPairs = array();
         while($lib = $stmt->fetch())
         {
-            if($this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = $lib->name;
+            if($this->checkPrivLib($lib, $extra))
+            {
+                if(strpos($extra, 'withObject') !== false)
+                {
+                    if($lib->product != 0) $lib->name = zget($products, $lib->product, '') . '/' . $lib->name;
+                    if($lib->project != 0) $lib->name = zget($projects, $lib->project, '') . '/' . $lib->name;
+                }
+
+                $libPairs[$lib->id] = $lib->name;
+            }
         }
 
         if(!empty($appendLibs))
@@ -1523,24 +1538,4 @@ class docModel extends model
 
         return $actions;
     }
-
-    public function getCompleteLibName()
-    {
-        $libPairs = array();
-        $products = $this->loadModel('product')->getPairs();
-        $projects = $this->loadModel('project')->getPairs();
-        $stmt = $this->dao->select('id,project,product,name')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->query(); 
-
-        while($lib = $stmt->fetch())
-        {
-            if($this->checkPrivLib($lib)) 
-            {
-                if($lib->product != 0) $lib->name = zget($products, $lib->product) . '/' . $lib->name;
-                if($lib->project != 0) $lib->name = zget($projects, $lib->project) . '/' . $lib->name;
-                $libPairs[$lib->id] = $lib->name;
-            }
-        }
-
-        return $libPairs;
-    }
 }
diff --git a/module/story/js/review.js b/module/story/js/review.js
index 9a1e92950e..364db60505 100644
--- a/module/story/js/review.js
+++ b/module/story/js/review.js
@@ -6,8 +6,6 @@ function switchShow(result)
     {
         $('#rejectedReasonBox').show();
         $('#preVersionBox').hide();
-        $('#priBox').hide();
-        $('#estimateBox').hide();
         $('#assignedTo').val('closed');
         $('#assignedTo').trigger("chosen:updated");
     }
diff --git a/module/tree/control.php b/module/tree/control.php
index cd2a732c34..656697ddfa 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -240,7 +240,7 @@ class tree extends control
 
         $this->view->module = $module;
         $this->view->type   = $type;
-        $this->view->libs   = $this->loadModel('doc')->getCompleteLibName();
+        $this->view->libs   = $this->loadModel('doc')->getLibs($type = 'all', $extra = 'withObject');
         $this->view->branch = $branch;
         $this->view->users  = $this->loadModel('user')->getPairs('noclosed|nodeleted', $module->owner);
 
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index c62900919b..2fb2be0294 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -2558,15 +2558,16 @@ class upgradeModel extends model
             ->andWhere('`key`')->eq('requiredFields')
             ->fetch();
 
-        if(strpos($value->value, 'finishedDate') === false) return;
+        if(strpos($value->value, 'finishedDate') === false) return true;
 
-        $value = ',' . $value->value . ',';
-        $value = trim(str_replace(',finishedDate,', '', $value), ',');
+        $value = trim(str_replace(',finishedDate,', ',', ",{$value->value},"), ',');
 
         $this->dao->update(TABLE_CONFIG)->set('`value`')->eq($value)
             ->where('`module`')->eq('task')
             ->andWhere('`section`')->eq('finish')
             ->andWhere('`key`')->eq('requiredFields')
             ->exec();
+
+        return true;
     }
 }