diff --git a/module/story/js/batchedit.ui.js b/module/story/js/batchedit.ui.js
index eff3373a30..bdd4acdecf 100644
--- a/module/story/js/batchedit.ui.js
+++ b/module/story/js/batchedit.ui.js
@@ -73,7 +73,7 @@ window.renderRowData = function($row, index, story)
                 items.push({text: branches[branch], value: branch});
             }
             options.items = items;
-            options.onChange = 'loadBranches(' + story.product + ', this)';
+            options.onChange = function(){loadBranches(story.product, this)};
             options.defaultValue = story.branch;
 
             $picker.render(options);
diff --git a/module/story/zen.php b/module/story/zen.php
index 2ed9ce8b74..dc03c90804 100644
--- a/module/story/zen.php
+++ b/module/story/zen.php
@@ -884,9 +884,8 @@ class storyZen extends story
         }
 
         $modulePairs = $this->tree->getOptionMenu($productID, 'story', 0, $branches);
-        $moduleList  = $branchProduct ? $modulePairs : array(0 => $modulePairs);
 
-        $modules         = array($productID => $moduleList);
+        $modules         = array($productID => $modulePairs);
         $branchTagOption = array($productID => $branchTagOption);
         $products        = array($productID => $product);
         $plans           = array($productID => $this->productplan->getBranchPlanPairs($productID, $branches, 'unexpired', true));