diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php
index b39d02977d..0e5ab9fcf8 100644
--- a/framework/base/helper.class.php
+++ b/framework/base/helper.class.php
@@ -136,7 +136,7 @@ class baseHelper
          */
         if($viewType == $app->getViewType())
         {
-            $link .= $moduleName . '/';
+            $link .= $moduleName . '.' . $viewType;
             return self::processOnlyBodyParam($link, $onlyBody);
         }
 
diff --git a/module/execution/model.php b/module/execution/model.php
index ec914615d7..cc2c914731 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4341,6 +4341,7 @@ class executionModel extends model
                     ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
                     ->where('t1.project')->eq((int)$executionID)
                     ->andWhere('t2.deleted')->eq(0)
+                    ->andWhere('t2.type')->eq('story')
                     ->orderBy('t1.`order`_desc')
                     ->fetchAll();
             }