diff --git a/module/bug/control.php b/module/bug/control.php
index 6887e47100..31a22977b5 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -297,7 +297,7 @@ class bug extends control
             if(defined('RUN_MODE') && RUN_MODE == 'api') $this->send(array('status' => 'success', 'data' => $bugID));
 
             $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&type=byModule&param={$this->post->module}");
-            $response['locate'] = isset($_SESSION['bugList']) ? $this->session->bugList : $location;
+            $response['locate'] = $location;
             $this->send($response);
         }
 
diff --git a/module/story/control.php b/module/story/control.php
index a0e813ec8b..ebdd26f07e 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -120,7 +120,8 @@ class story extends control
                 $this->send($response);
             }
 
-            $response['locate'] = $this->createLink('project', 'story', "projectID=$projectID");
+            $moduleID = $this->post->module ? $this->post->module : 0;
+            $response['locate'] = $this->createLink('project', 'story', "projectID=$projectID&branch=&browseType=byModule&moduleID=$moduleID");
             if($projectID == 0) $response['locate'] = $this->createLink('story', 'view', "storyID=$storyID");
             $this->send($response);
         }
diff --git a/module/task/control.php b/module/task/control.php
index 7a0bdf356e..1bd21c514d 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -146,6 +146,8 @@ class task extends control
             }
             elseif($this->post->after == 'toTaskList')
             {
+                $moduleID  = $this->post->module ? $this->post->module : 0;
+                $taskLink  = $this->createLink('project', 'task', "projectID=$projectID&browseType=byModule&param=$moduleID");
                 $response['locate'] = $taskLink;
                 $this->send($response);
             }