diff --git a/module/product/control.php b/module/product/control.php
index 0529cfcd88..eeb0a20594 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1048,7 +1048,7 @@ class product extends control
         $multiple = strpos($param, 'multiple') === false ? '' : 'multiple';
         $output   = html::select($field, $plans, $planID, "class='form-control chosen' $multiple");
 
-        if($branch == 0 and strpos($param, 'edit') and !strpos($param, 'forstory')) $output = html::select($field, $plans, $planID, "class='form-control chosen' multiple");
+        if($branch == 0 and strpos($param, 'edit') and (strpos($param, 'forstory') === false)) $output = html::select($field, $plans, $planID, "class='form-control chosen' multiple");
 
         if(count($plans) == 1 and $needCreate and $needCreate !== 'false')
         {
diff --git a/module/story/control.php b/module/story/control.php
index 72670a7d46..f2e1fa60fa 100755
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -440,8 +440,7 @@ class story extends control
         $this->view->users            = $users;
         $this->view->moduleID         = $moduleID;
         $this->view->moduleOptionMenu = $moduleOptionMenu;
-        $this->view->plans            = str_replace('2030-01-01', $this->lang->story->undetermined, $this->loadModel('productplan')->getPairsForStory($productID, $branch == 0 ? '' : $branch, 'skipParent|unexpired|noclosed'));
-        $this->view->planID           = $planID;
+        $this->view->plans            = str_replace('2030-01-01', $this->lang->story->undetermined, $this->loadModel('productplan')->getPairsForStory($productID, $branch == 0 ? '' : $branch, 'skipParent|unexpired|noclosed'));        $this->view->planID           = $planID;
         $this->view->source           = $source;
         $this->view->sourceNote       = $sourceNote;
         $this->view->color            = $color;
diff --git a/module/story/lang/de.php b/module/story/lang/de.php
index a102071878..7111526b98 100644
--- a/module/story/lang/de.php
+++ b/module/story/lang/de.php
@@ -12,7 +12,7 @@
 global $config;
 $lang->story->create            = "Story hinzufügen";
 
-$lang->story->requirement       = zget($lang, 'URCommon', "Requirement");
+$lang->story->requirement       = 'UR';
 $lang->story->story             = zget($lang, 'SRCommon', "Story");
 $lang->story->createStory       = 'Create ' . $lang->story->story;
 $lang->story->createRequirement = 'Create ' . $lang->story->requirement;
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index 17ae16c93a..664d1a114b 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -12,7 +12,7 @@
 global $config;
 $lang->story->create            = "Create Story";
 
-$lang->story->requirement       = zget($lang, 'URCommon', "Requirement");
+$lang->story->requirement       = 'UR';
 $lang->story->story             = zget($lang, 'SRCommon', "Story");
 $lang->story->createStory       = 'Create ' . $lang->story->story;
 $lang->story->createRequirement = 'Create ' . $lang->story->requirement;
diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php
index b05c47cf17..e11cd9a62c 100644
--- a/module/story/lang/fr.php
+++ b/module/story/lang/fr.php
@@ -12,7 +12,7 @@
 global $config;
 $lang->story->create            = "Créer Story";
 
-$lang->story->requirement       = zget($lang, 'URCommon', "Requirement");
+$lang->story->requirement       = 'UR';
 $lang->story->story             = zget($lang, 'SRCommon', "Story");
 $lang->story->createStory       = 'Create ' . $lang->story->story;
 $lang->story->createRequirement = 'Create ' . $lang->story->requirement;
diff --git a/module/story/model.php b/module/story/model.php
index bb95eea787..e4ff3f4f38 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -889,7 +889,7 @@ class storyModel extends model
             return false;
         }
 
-        $storyPlan = !empty($_POST['plan']) ? $_POST['plan'] : array();
+        $storyPlan = !empty($_POST['plan']) ? array_filter($_POST['plan']) : array();
         if(count($storyPlan) > 1)
         {
             $oldStoryPlan = !empty($oldStory->planTitle) ? array_keys($oldStory->planTitle) : array();