diff --git a/module/story/control.php b/module/story/control.php
index b4cb2b4999..618a9933c9 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -2227,7 +2227,7 @@ class story extends control
 
         /* Get story, product, products, and queryID. */
         $story    = $this->story->getById($storyID);
-        $products = $this->product->getPairs();
+        $products = $this->product->getPairs('', 0, '', true);
         $queryID  = 0;
 
         /* Change for requirement story title. */
@@ -2239,6 +2239,10 @@ class story extends control
             unset($this->config->product->search['fields']['plan']);
             unset($this->config->product->search['fields']['stage']);
         }
+        else
+        {
+            $this->lang->story->title = str_replace($this->lang->URCommon, $this->lang->SRCommon, $this->lang->story->title);
+        }
 
         /* Build search form. */
         $actionURL = $this->createLink('story', 'linkStory', "storyID=$storyID&type=$type&linkedStoryID=$linkedStoryID&browseType=bySearch&queryID=myQueryID&storyType=$storyType", '', true);
diff --git a/module/story/view/linkstory.html.php b/module/story/view/linkstory.html.php
index dfa0dd7af5..3c5fb388fe 100644
--- a/module/story/view/linkstory.html.php
+++ b/module/story/view/linkstory.html.php
@@ -48,7 +48,10 @@
       <tbody>
       <?php $storyCount = 0;?>
       <?php foreach($stories2Link as $story2Link):?>
-      <?php $storyLink = $this->createLink('story', 'view', "storyID=$story2Link->id");?>
+      <?php
+         $storyLink = $this->createLink('story', 'view', "storyID=$story2Link->id");
+         if($app->tab == 'project') $storyLink = $this->createLink('projectstory', 'view', "storyID=$story2Link->id");
+      ?>
       <?php $canView   = common::hasPriv($story2Link->type, 'view');?>
       <tr>
         <td class='c-id'>
@@ -59,7 +62,7 @@
           <?php echo $canView ? html::a($storyLink, sprintf('%03d', $story2Link->id)) : sprintf('%03d', $story2Link->id);?>
         </td>
         <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story2Link->pri?>' title='<?php echo zget($lang->story->priList, $story2Link->pri, $story2Link->pri);?>'><?php echo zget($lang->story->priList, $story2Link->pri, $story2Link->pri);?></span></td>
-        <td class='text-left nobr' title="<?php echo $story2Link->title?>"><?php echo $canView ? html::a($storyLink, $story2Link->title, '_blank') : $story2Link->title;?></td>
+        <td class='text-left nobr' title="<?php echo $story2Link->title?>"><?php echo $canView ? html::a($storyLink, $story2Link->title) : $story2Link->title;?></td>
         <td><?php echo $this->processStatus('story', $story2Link);?></td>
         <?php if($story->type == 'requirement'):?>
         <td><?php echo zget($lang->story->stageList, $story2Link->stage);?></td>