diff --git a/extension/lite/product/ext/control/browse.php b/extension/lite/product/ext/control/browse.php
index d22f4a9d88..e753d49573 100644
--- a/extension/lite/product/ext/control/browse.php
+++ b/extension/lite/product/ext/control/browse.php
@@ -81,7 +81,6 @@ class product extends control
         $project = $projectID ? $this->loadModel('project')->getByID($projectID) : null;
 
         /* Get stories. */
-        if(in_array($browseType, array('reviewing', 'draft', 'changing'))) $browseType .= 'story';
         $stories = $this->productZen->getStories($projectID, $productID, $branchID, $moduleID, $param, $storyType, $browseType, $orderBy, $pager);
 
         /* Process the sql, get the conditon partion, save it to session. */
diff --git a/extension/lite/projectstory/ext/lang/de/lite.php b/extension/lite/projectstory/ext/lang/de/lite.php
index 89163e28fe..5f60b3fe6b 100644
--- a/extension/lite/projectstory/ext/lang/de/lite.php
+++ b/extension/lite/projectstory/ext/lang/de/lite.php
@@ -2,5 +2,3 @@
 unset($lang->projectstory->featureBar['story']['changed']);
 unset($lang->projectstory->featureBar['story']['linkedExecution']);
 unset($lang->projectstory->featureBar['story']['unlinkedExecution']);
-$lang->projectstory->featureBar['story']['closedstory'] = $lang->projectstory->featureBar['story']['closed'];
-unset($lang->projectstory->featureBar['story']['closed']);
diff --git a/extension/lite/projectstory/ext/lang/en/lite.php b/extension/lite/projectstory/ext/lang/en/lite.php
index 89163e28fe..5f60b3fe6b 100644
--- a/extension/lite/projectstory/ext/lang/en/lite.php
+++ b/extension/lite/projectstory/ext/lang/en/lite.php
@@ -2,5 +2,3 @@
 unset($lang->projectstory->featureBar['story']['changed']);
 unset($lang->projectstory->featureBar['story']['linkedExecution']);
 unset($lang->projectstory->featureBar['story']['unlinkedExecution']);
-$lang->projectstory->featureBar['story']['closedstory'] = $lang->projectstory->featureBar['story']['closed'];
-unset($lang->projectstory->featureBar['story']['closed']);
diff --git a/extension/lite/projectstory/ext/lang/fr/lite.php b/extension/lite/projectstory/ext/lang/fr/lite.php
index 89163e28fe..5f60b3fe6b 100644
--- a/extension/lite/projectstory/ext/lang/fr/lite.php
+++ b/extension/lite/projectstory/ext/lang/fr/lite.php
@@ -2,5 +2,3 @@
 unset($lang->projectstory->featureBar['story']['changed']);
 unset($lang->projectstory->featureBar['story']['linkedExecution']);
 unset($lang->projectstory->featureBar['story']['unlinkedExecution']);
-$lang->projectstory->featureBar['story']['closedstory'] = $lang->projectstory->featureBar['story']['closed'];
-unset($lang->projectstory->featureBar['story']['closed']);
diff --git a/extension/lite/projectstory/ext/lang/zh-cn/lite.php b/extension/lite/projectstory/ext/lang/zh-cn/lite.php
index 89163e28fe..5f60b3fe6b 100644
--- a/extension/lite/projectstory/ext/lang/zh-cn/lite.php
+++ b/extension/lite/projectstory/ext/lang/zh-cn/lite.php
@@ -2,5 +2,3 @@
 unset($lang->projectstory->featureBar['story']['changed']);
 unset($lang->projectstory->featureBar['story']['linkedExecution']);
 unset($lang->projectstory->featureBar['story']['unlinkedExecution']);
-$lang->projectstory->featureBar['story']['closedstory'] = $lang->projectstory->featureBar['story']['closed'];
-unset($lang->projectstory->featureBar['story']['closed']);
diff --git a/framework/router.class.php b/framework/router.class.php
index c83a902d09..ca90bddbec 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -344,16 +344,16 @@ class router extends baseRouter
                 /* Set default story concept and init UR and SR concept. */
                 $lang->URCommon = $URPairs[$config->URSR] ?? reset($URPairs);
                 $lang->SRCommon = $SRPairs[$config->URSR] ?? reset($SRPairs);
-            }
 
-            /* Replace common lang. */
-            $customMenus = array();
-            try
-            {
-                $customMenus = $this->dbQuery('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `lang`='{$this->clientLang}' AND `section`='' AND `vision`='{$config->vision}'")->fetchAll();
+                /* Replace common lang. */
+                $customMenus = array();
+                try
+                {
+                    $customMenus = $this->dbQuery('SELECT * FROM' . TABLE_LANG . "WHERE `module`='common' AND `lang`='{$this->clientLang}' AND `section`='' AND `vision`='{$config->vision}'")->fetchAll();
+                }
+                catch(PDOException){}
+                foreach($customMenus as $menu) if(isset($lang->{$menu->key})) $lang->{$menu->key} = $menu->value;
             }
-            catch(PDOException){}
-            foreach($customMenus as $menu) if(isset($lang->{$menu->key})) $lang->{$menu->key} = $menu->value;
         }
     }
 
diff --git a/module/common/model.php b/module/common/model.php
index d8ff25f6dc..5f60353d9e 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -594,6 +594,7 @@ class commonModel extends model
         foreach($menuOrder as $key => $group)
         {
             if($group != 'my' && !empty($app->user->rights['acls']['views']) && !isset($app->user->rights['acls']['views'][$group])) continue; // 后台权限分组中没有给导航视图
+            if(!isset($lang->mainNav->$group)) continue;
 
             $nav = $lang->mainNav->$group;
             list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav);
diff --git a/module/program/tao.php b/module/program/tao.php
index dc78fab5fa..c32c3c2445 100644
--- a/module/program/tao.php
+++ b/module/program/tao.php
@@ -271,10 +271,11 @@ class programTao extends programModel
         $summary = $this->setNoTaskExecution($projectIdList);
         /* 2. Get summary of executions to be refreshed. */
         $tasks = $this->dao->select('t1.id, execution, t1.estimate, t1.consumed, t1.`left`, t1.status')->from(TABLE_TASK)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution = t2.id')
             ->where('t1.deleted')->eq(0)
             ->andWhere('t1.parent')->ge(0) // Ignore parent task.
-            ->beginIF(!empty($projectIdList))->andWhere('t1.project')->in($projectIdList)->fi()
+            ->andWhere('t2.deleted')->eq(0)
+            ->beginIF(!empty($projectIdList))->andWhere('t2.project')->in($projectIdList)->fi()
             ->fetchAll('id');
 
         foreach($tasks as $task)