diff --git a/module/execution/control.php b/module/execution/control.php
index 54b85d2135..ba15a7a308 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -757,7 +757,7 @@ class execution extends control
             }
         }
         $actionURL    = $this->createLink('execution', 'story', "executionID=$executionID&orderBy=$orderBy&type=bySearch&queryID=myQueryID");
-        $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
+        $branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
         $this->execution->buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, 'executionStory', $executionID);
 
         /* Header and position. */
diff --git a/module/execution/model.php b/module/execution/model.php
index 037e0f82c5..59baf1c37e 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1717,7 +1717,7 @@ class executionModel extends model
                     foreach($branches[$product->id] as $branchID => $branch)
                     {
                         if(!isset($branchGroups[$product->id][$branchID])) continue;
-                        $branchPairs[$branchID] = ((count($products) > 1 and $branchID) ? $product->name . '/' : '') . $branchGroups[$product->id][$branchID];
+                        $branchPairs[$branchID] = ((count($products) > 1) ? $product->name . '/' : '') . $branchGroups[$product->id][$branchID];
                     }
                 }
                 else