diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php
index 78b9818611..e32ea8a380 100644
--- a/module/build/view/linkbug.html.php
+++ b/module/build/view/linkbug.html.php
@@ -19,7 +19,7 @@
     <strong><?php echo html::a($this->createLink('build', 'view', 'buildID=' . $build->id), $build->name);?></strong>
     <small class='text-muted'> <?php echo $lang->build->linkBug;?> <?php echo html::icon($lang->icons['link']);?></small>
   </div>
-  <div class='actions'><?php echo html::a($this->server->http_referer, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
+  <div class='actions'><?php echo html::a(inlink('view', "buildID=$build->id"), '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
 </div>
 <div id='querybox' class='show'></div>
 <div id='bugList'>
@@ -47,7 +47,7 @@
         <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 class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
         <td><?php echo $users[$bug->openedBy];?></td>
-        <td style='overflow:visible;padding-top:1px;padding-bottom:1px;'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? substr($users[$bug->resolvedBy], 2) : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?></td>
+        <td style='overflow:visible;padding-top:1px;padding-bottom:1px;'><?php echo ($bug->status == 'resolved' or $bug->status == 'closed') ? $users[$bug->resolvedBy] : html::select("resolvedBy[{$bug->id}]", $users, $this->app->user->account, "class='form-control chosen'");?></td>
         <td class='text-center bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
       </tr>
       <?php endforeach;?>
diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php
index 94f693c285..22cadbd7da 100644
--- a/module/build/view/linkstory.html.php
+++ b/module/build/view/linkstory.html.php
@@ -19,7 +19,7 @@
     <strong><?php echo html::a($this->createLink('build', 'view', 'build=' . $build->id), $build->name);?></strong>
     <small class='text-muted'> <?php echo $lang->build->linkStory;?> <?php echo html::icon($lang->icons['link']);?></small>
   </div>
-  <div class='actions'><?php echo html::a($this->server->http_referer, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
+  <div class='actions'><?php echo html::a(inlink('view', "buildID=$build->id"), '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
 </div>
 <div id='querybox' class='show'></div>
 <div id='storyList'>
diff --git a/module/productplan/control.php b/module/productplan/control.php
index 2cf6c10aa7..ad3af86bf2 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -235,8 +235,9 @@ class productplan extends control
         $this->config->product->search['params']['product']['values'] = $products + array('all' => $this->lang->product->allProductsOfProject);
         $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts($products);
         $this->config->product->search['params']['module']['values']  = $this->tree->getOptionMenu($plan->product, $viewType = 'story', $startModuleID = 0);
-        unset($this->lang->story->statusList['closed']);
-        $this->config->product->search['params']['status'] = array('operator' => '=',       'control' => 'select', 'values' => $this->lang->story->statusList);
+        $storyStatusList = $this->lang->story->statusList;
+        unset($storyStatusList['closed']);
+        $this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $storyStatusList);
         $this->loadModel('search')->setSearchParams($this->config->product->search);
 
         if($browseType == 'bySearch')
diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php
index 5f1003ce0d..d8518d1a14 100644
--- a/module/productplan/view/linkbug.html.php
+++ b/module/productplan/view/linkbug.html.php
@@ -19,7 +19,7 @@
     <strong><?php echo html::a($this->createLink('productplan', 'view', 'planID=' . $plan->id), $plan->title);?></strong>
     <small class='text-muted'> <?php echo $lang->productplan->linkBug;?> <?php echo html::icon($lang->icons['link']);?></small>
   </div>
-  <div class='actions'><?php echo html::a($this->server->http_referer, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
+  <div class='actions'><?php echo html::a(inlink('view', "planID=$plan->id"), '<i class="icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
 </div>
 <div id='querybox' class='show'></div>
 <div id='bugList'>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php
index ab3290111b..8130061a6d 100644
--- a/module/productplan/view/linkstory.html.php
+++ b/module/productplan/view/linkstory.html.php
@@ -19,7 +19,7 @@
     <strong><?php echo html::a($this->createLink('productplan', 'view', 'planID=' . $plan->id), $plan->title);?></strong>
     <small class='text-muted'> <?php echo $lang->productplan->linkStory;?> <?php echo html::icon($lang->icons['link']);?></small>
   </div>
-  <div class='actions'><?php echo html::a($this->server->http_referer, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
+  <div class='actions'><?php echo html::a(inlink('view', "planID=$plan->id"), '<i class="icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
 </div>
 <div id='querybox' class='show'></div>
 <div id='storyList'>
diff --git a/module/release/control.php b/module/release/control.php
index d8be3aab90..7ab242d329 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -402,7 +402,7 @@ class release extends control
         /* Build the search form. */
         $this->loadModel('bug');
         $queryID = ($browseType == 'bysearch') ? (int)$param : 0;
-        unset($this->config->product->search['fields']['product']);
+        unset($this->config->bug->search['fields']['product']);
         $this->config->bug->search['actionURL'] = $this->createLink('release', 'linkBug', "planID=$releaseID&browseType=bySearch&queryID=myQueryID");   
         $this->config->bug->search['queryID']   = $queryID;
         $this->config->bug->search['params']['plan']['values']          = $this->loadModel('productplan')->getForProducts(array($release->product => $release->product));
@@ -418,10 +418,10 @@ class release extends control
         }
         else
         {
-            $allBugs = empty($build->project) ? array() : $this->bug->getReleaseBugs($build->id, $release->product); 
+            $allBugs = empty($build->project) ? array() : $this->bug->getReleaseBugs($build->id, $release->product);
         }
 
-        $this->view->title       = $release->name . $this->lang->colon . $this->lang->productplan->linkBug;
+        $this->view->title       = $release->name . $this->lang->colon . $this->lang->release->linkBug;
         $this->view->position[]  = html::a($this->createLink('release', 'view', "releaseID=$release->id"), $release->name);
         $this->view->position[]  = $this->lang->release->linkBug;
         $this->view->allBugs     = $allBugs;
diff --git a/module/release/view/linkbug.html.php b/module/release/view/linkbug.html.php
index 17fda6c58f..813e640be8 100644
--- a/module/release/view/linkbug.html.php
+++ b/module/release/view/linkbug.html.php
@@ -19,7 +19,7 @@
     <strong><?php echo html::a($this->createLink('release', 'view', 'releaseID=' . $release->id), $release->name);?></strong>
     <small class='text-muted'> <?php echo $lang->release->linkBug;?> <?php echo html::icon($lang->icons['link']);?></small>
   </div>
-  <div class='actions'><?php echo html::a($this->server->http_referer, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
+  <div class='actions'><?php echo html::a(inlink('view', "releaseID=$release->id"), '<i class="icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
 </div>
 <div id='querybox' class='show'></div>
 <div id='bugList'>
@@ -32,7 +32,7 @@
         <th class='w-pri'>   <?php echo $lang->priAB;?></th>
         <th>                 <?php echo $lang->bug->title;?></th>
         <th class='w-user'>  <?php echo $lang->openedByAB;?></th>
-        <th class='w-150px'> <?php echo $lang->bug->resolvedBy;?></th>
+        <th class='w-user'> <?php echo $lang->bug->resolvedBy;?></th>
         <th class='w-80px'>  <?php echo $lang->statusAB;?></th>
       </tr>
       </thead>
@@ -47,7 +47,7 @@
         <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 class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
         <td><?php echo $users[$bug->openedBy];?></td>
-        <td><?php echo substr($users[$bug->resolvedBy], 2);?></td>
+        <td><?php echo $users[$bug->resolvedBy];?></td>
         <td class='text-center bug-<?php echo $bug->status?>'><?php echo $lang->bug->statusList[$bug->status];?></td>
       </tr>
       <?php endforeach;?>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php
index 1ec84c5c78..2b111cd372 100644
--- a/module/release/view/linkstory.html.php
+++ b/module/release/view/linkstory.html.php
@@ -19,7 +19,7 @@
     <strong><?php echo html::a($this->createLink('release', 'view', 'release=' . $release->id), $release->name);?></strong>
     <small class='text-muted'> <?php echo $lang->release->linkStory;?> <?php echo html::icon($lang->icons['link']);?></small>
   </div>
-  <div class='actions'><?php echo html::a($this->server->http_referer, '<i class="icon-goback icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
+  <div class='actions'><?php echo html::a(inlink('view', "releaseID=$release->id"), '<i class="icon-level-up icon-large icon-rotate-270"></i> ' . $lang->goback, '', "class='btn'")?></div>
 </div>
 <div id='querybox' class='show'></div>
 <div id='storyList'>