diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js
index 05d613bebd..e650a2138f 100644
--- a/module/execution/js/edit.js
+++ b/module/execution/js/edit.js
@@ -123,7 +123,7 @@ $(function()
             hidePlanBox(attribute);
         })
 
-        $('#attribute').change();
+        hidePlanBox(executionAttr);
     }
 })
 var lastProjectID = $("#project").val();
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index b9c2a16446..e8c2ec2f07 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -15,6 +15,7 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::import($jsRoot . 'misc/date.js');?>
 <?php js::set('isStage', $execution->type == 'stage');?>
+<?php js::set('executionAttr', $execution->attribute);?>
 <?php js::set('manageProductsLang', $lang->project->manageProducts);?>
 <?php js::set('manageProductPlanLang', $lang->project->manageProductPlan);?>
 <div id='mainContent' class='main-content'>
@@ -161,7 +162,7 @@
         <?php $i = 0;?>
         <?php foreach($linkedProducts as $product):?>
         <tr class="<?php echo $hidden;?>">
-          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
+          <th id='productTitle'><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
               <div class="col-sm-6 productBox">
@@ -252,7 +253,7 @@
         <?php $i = 0;?>
         <?php foreach($linkedProducts as $product):?>
         <tr>
-          <th><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
+          <th id="productTitle"><?php if($i == 0) echo $lang->project->manageProductPlan;?></th>
           <td class='text-left productsBox' colspan="3">
             <div class='row'>
               <div class="col-sm-6 productBox">
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index 1e1232132c..3273c180a6 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -345,7 +345,7 @@
               </div>
             </div>
             <?php endif;?>
-            <?php if($execution->projectInfo->hasProduct or $execution->projectInfo->model == 'scrum'):?>
+            <?php if(!(strpos($execution->projectInfo->model, 'waterfall') !== false and (empty($execution->projectInfo->hasProduct) or in_array($execution->attribute, array('request', 'review'))))):?>
             <div class="detail">
               <div class="detail-title"><strong><?php echo $lang->execution->linkPlan;?></strong></div>
               <div class="detail-content">