diff --git a/module/todo/js/view.js b/module/todo/js/view.js
index 1c0f519a36..fa303d8f09 100644
--- a/module/todo/js/view.js
+++ b/module/todo/js/view.js
@@ -24,7 +24,7 @@ $(function()
         var projectID = $('#project').val();
         var link      = createLink('task', 'create', 'projectID=' + executionID + '&storyID=0&moduleID=0&taskID=0&todoID=' + todoID, config.defaultView, 'no', projectID);
 
-        parent.location.href = link;
+        location.href = link;
     })
 
     $('#toStoryButton').click(function()
@@ -35,7 +35,7 @@ $(function()
         var productID = $('#product').val();
         var link      = createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&projectID=0&bugID=0&planID=0&todoID=' + todoID, config.defaultView, 'no', programID);
 
-        parent.location.href = link;
+        location.href = link;
     })
 
     $('#toBugButton').click(function()
@@ -46,7 +46,7 @@ $(function()
         var productID = $('#product').val();
         var link      = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, 'no', projectID);
 
-        parent.location.href = link;
+        location.href = link;
     })
 
     $('#project, #product').change();
diff --git a/module/user/control.php b/module/user/control.php
index e00fcf4079..2bdbe2d02b 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -75,13 +75,14 @@ class user extends control
         $account = $user->account;
         $todos   = $this->todo->getList($type, $account, $status, 0, $pager, $sort);
         $date    = (int)$type == 0 ? helper::today() : $type;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Change the menu when in my module. */
         $this->resetMenu($fromModule);
 
         /* set menus. */
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         $this->view->title      = $this->lang->user->common . $this->lang->colon . $this->lang->user->todo;
         $this->view->position[] = $this->lang->user->todo;
@@ -121,6 +122,7 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set menu. */
         $this->lang->set('menugroup.user', 'company');
@@ -137,7 +139,7 @@ class user extends control
         $this->view->type       = $type;
         $this->view->user       = $user;
         $this->view->pager      = $pager;
-        $this->view->userList   = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList   = $this->user->setUserList($users, $userID, $fromModule);
 
         $this->display();
     }
@@ -165,10 +167,11 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set the menu. */
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         /* Change the menu when in my module. */
         $this->resetMenu($fromModule);
@@ -210,10 +213,11 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set menu. */
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         /* Load the lang of bug module. */
         $this->app->loadLang('bug');
@@ -254,10 +258,11 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Set menu. */
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         /* Save session. */
         $this->session->set('testtaskList', $this->app->getURI(true));
@@ -309,6 +314,7 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
@@ -344,7 +350,7 @@ class user extends control
         $this->view->pageID     = $pageID;
         $this->view->orderBy    = $orderBy;
         $this->view->pager      = $pager;
-        $this->view->userList   = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList   = $this->user->setUserList($users, $userID, $fromModule);
 
         $this->display();
     }
@@ -364,6 +370,7 @@ class user extends control
     {
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -372,7 +379,7 @@ class user extends control
         /* Set the menus. */
         $this->loadModel('project');
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclose|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         /* Change the menu when in my module. */
         $this->resetMenu($fromModule);
@@ -405,6 +412,7 @@ class user extends control
     {
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -412,7 +420,7 @@ class user extends control
 
         /* Set the menus. */
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclose|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         /* Change the menu when in my module. */
         $this->resetMenu($fromModule);
@@ -447,6 +455,7 @@ class user extends control
     {
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -454,7 +463,7 @@ class user extends control
 
         /* Set the menus. */
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclose|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         /* Change the menu when in my module. */
         $this->resetMenu($fromModule);
@@ -485,6 +494,7 @@ class user extends control
 
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* Change the menu when in my module. */
         $this->resetMenu($fromModule);
@@ -497,7 +507,7 @@ class user extends control
         $this->view->groups       = $this->loadModel('group')->getByAccount($account);
         $this->view->deptPath     = $this->dept->getParents($user->dept);
         $this->view->personalData = $this->user->getPersonalData($user->account);
-        $this->view->userList     = $this->user->setUserList($this->user->getPairs('noempty|noclose|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList     = $this->user->setUserList($users, $userID, $fromModule);
 
         $this->display();
     }
@@ -1080,10 +1090,11 @@ class user extends control
     {
         $user    = $this->user->getById($userID, 'id');
         $account = $user->account;
+        $users   = $fromModule == 'user' ? $this->user->getPairs('noempty|noclosed|nodeleted|useid') : $this->loadModel('dept')->getDeptUserPairs($user->dept, 'useid');
 
         /* set menus. */
         $this->lang->set('menugroup.user', 'company');
-        $this->view->userList = $this->user->setUserList($this->user->getPairs('noempty|noclosed|nodeleted|useid'), $userID, $fromModule);
+        $this->view->userList = $this->user->setUserList($users, $userID, $fromModule);
 
         /* Save session. */
         $uri   = $this->app->getURI(true);
diff --git a/module/user/view/bug.html.php b/module/user/view/bug.html.php
index cccf0deb0f..37ab13cbb2 100644
--- a/module/user/view/bug.html.php
+++ b/module/user/view/bug.html.php
@@ -50,11 +50,11 @@
       <tbody>
         <?php foreach($bugs as $bug):?>
         <tr class='text-center'>
-          <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id, '_blank');?></td>
+          <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', false, $bug->PRJ), $bug->id, '_blank');?></td>
           <td><span class='<?php echo 'severity' . zget($lang->bug->severityList, $bug->severity, $bug->severity)?>'><?php echo zget($lang->bug->severityList, $bug->severity, $bug->severity)?></span></td>
           <td><span class='<?php echo 'pri' . zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
           <td><?php echo $lang->bug->typeList[$bug->type]?></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
+          <td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', false, $bug->PRJ), $bug->title);?></td>
           <td><?php echo zget($users, $bug->openedBy);?></td>
           <td><?php echo zget($users, $bug->resolvedBy);?></td>
           <td><?php echo zget($lang->bug->resolutionList, $bug->resolution);?></td>
diff --git a/module/user/view/task.html.php b/module/user/view/task.html.php
index b70464b6f9..8b82f83ca4 100644
--- a/module/user/view/task.html.php
+++ b/module/user/view/task.html.php
@@ -54,13 +54,13 @@
       <tbody>
         <?php foreach($tasks as $task):?>
         <tr class='text-left'>
-          <td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
+          <td><?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', false, $task->PRJ), sprintf('%03d', $task->id));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri)?></span></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID"), $task->projectName);?></td>
+          <td class='text-left nobr'><?php echo html::a($this->createLink('project', 'browse', "projectid=$task->projectID", '', false, $task->PRJ), $task->projectName);?></td>
           <td class='text-left nobr'>
             <?php if(!empty($task->team))   echo '<span class="label label-badge label-light">' . $this->lang->task->multipleAB . '</span> ';?>
             <?php if($task->parent > 0) echo '<span class="label label-badge label-light">' . $this->lang->task->childrenAB . '</span> ';?>
-            <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id"), $task->name, null, "style='color: $task->color'");?>
+            <?php echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', false, $task->PRJ), $task->name, null, "style='color: $task->color'");?>
           </td>
           <td><?php echo $task->estimate;?></td>
           <td><?php echo $task->consumed;?></td>
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 8e2b027e9f..eb5d4e521e 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -50,9 +50,9 @@
         <?php foreach($cases as $case):?>
         <?php $caseID = $type == 'case2Him' ? $case->case : $case->id?>
         <tr class='text-left'>
-          <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), sprintf('%03d', $caseID));?></td>
+          <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version", '', false, $case->PRJ), sprintf('%03d', $caseID));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
-          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version"), $case->title);?></td>
+          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version", '', false, $case->PRJ), $case->title);?></td>
           <td><?php echo $lang->testcase->typeList[$case->type];?></td>
           <td><?php echo zget($users, $case->openedBy);?></td>
           <td><?php echo zget($users, $case->lastRunner);?></td>
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index f3648490f7..d17b868914 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -41,10 +41,10 @@
       <tbody>
         <?php foreach($tasks as $task):?>
         <tr>
-          <td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id"), $task->name);?></td>
+          <td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', false, $task->PRJ), sprintf('%03d', $task->id));?></td>
+          <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', false, $task->PRJ), $task->name);?></td>
           <td class='nobr'><?php echo $task->projectName?></td>
-          <td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build"), $task->buildName));?></td>
+          <td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', false, $task->PRJ), $task->buildName));?></td>
           <td><?php echo $task->begin?></td>
           <td><?php echo $task->end?></td>
           <td class='task-<?php echo $task->status?>'><?php echo $this->processStatus('testtask', $task);?></td>