diff --git a/framework/helper.class.php b/framework/helper.class.php
index 5fda598ef7..269de67593 100644
--- a/framework/helper.class.php
+++ b/framework/helper.class.php
@@ -509,7 +509,7 @@ function initPageEntity(object $object): array
  * @access public
  * @return array
  */
-function initTableData(array $items, array &$fieldList, ?object $model = null): array
+function initTableData(array $items, array &$fieldList, ?object $model = null, string $moduleName = ''): array
 {
     if(!empty($_GET['orderBy']) && strpos($_GET['orderBy'], '-') !== false) list($orderField, $orderValue) = explode('_', $_GET['orderBy']);
     if(!empty($orderField) && !empty($orderValue) && !empty($fieldList[$orderField]))
diff --git a/module/common/model.php b/module/common/model.php
index 79905eb94d..4837bc872f 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2575,8 +2575,7 @@ eof;
         $rawModule = $moduleName;
         if(!empty($actionData['url']) && is_array($actionData['url']))
         {
-            if(empty($actionData['url']['current']))                                                                    $moduleName = $actionData['url']['module'];
-            if($actionData['url']['module'] == 'story' && in_array($moduleName, array('epic', 'requirement', 'story'))) $moduleName = $data->type;
+            $moduleName     = ($actionData['url']['module'] == 'story' && in_array($moduleName, array('epic', 'requirement', 'story'))) ? $data->type : $actionData['url']['module'];
             $methodName     = $actionData['url']['method'];
             $params         = $actionData['url']['params'];
             $storySubdivide = in_array($moduleName, array('epic', 'requirement', 'story')) && $action == 'subdivide';