diff --git a/module/build/ui/view.html.php b/module/build/ui/view.html.php
index 021fad58a7..36cf177a32 100644
--- a/module/build/ui/view.html.php
+++ b/module/build/ui/view.html.php
@@ -270,7 +270,7 @@ detailBody
                         ) : null
                     ),
                     h::hr(set::className('mt-6')),
-                    history()
+                    history(set::objectID($build->id))
                 )
             )
         )
diff --git a/module/company/ui/dynamic.html.php b/module/company/ui/dynamic.html.php
index ccaea525f8..87f0681518 100644
--- a/module/company/ui/dynamic.html.php
+++ b/module/company/ui/dynamic.html.php
@@ -83,7 +83,7 @@ featureBar
             on::change('changeItem')
         )
     ),
-    li(searchToggle(set::module('action')))
+    li(searchToggle(set::module('action'), set::open($browseType == 'bysearch')))
 );
 
 $content = null;
diff --git a/module/productplan/config.php b/module/productplan/config.php
index 5050404266..76a9812683 100644
--- a/module/productplan/config.php
+++ b/module/productplan/config.php
@@ -17,23 +17,6 @@ $config->productplan->laneColorList = array('#32C5FF', '#006AF1', '#9D28B2', '#F
 $config->productplan->future = '2030-01-01';
 
 global $app, $lang;
-$config->productplan->search['module'] = 'productplan';
-$config->productplan->browse = new stdclass();
-
-$config->productplan->search['fields']['title']  = $lang->productplan->title;
-$config->productplan->search['fields']['id']     = $lang->productplan->id;
-$config->productplan->search['fields']['branch'] = $lang->productplan->branch;
-$config->productplan->search['fields']['status'] = $lang->productplan->status;
-$config->productplan->search['fields']['begin']  = $lang->productplan->begin;
-$config->productplan->search['fields']['end']    = $lang->productplan->end;
-
-$config->productplan->search['params']['id']     = array('operator' => '=',       'control' => 'input',  'values' => '');
-$config->productplan->search['params']['title']  = array('operator' => 'include', 'control' => 'input',  'values' => '');
-$config->productplan->search['params']['branch'] = array('operator' => 'include', 'control' => 'select', 'values' => '');
-$config->productplan->search['params']['status'] = array('operator' => '=',       'control' => 'select', 'values' => $lang->productplan->statusList);
-$config->productplan->search['params']['begin']  = array('operator' => '=',       'control' => 'input',  'values' => '', 'class' => 'date');
-$config->productplan->search['params']['end']    = array('operator' => '=',       'control' => 'input',  'values' => '', 'class' => 'date');
-
 $config->productplan->defaultFields['story']     = array('id', 'title', 'module', 'pri', 'status', 'openedBy', 'assignedTo', 'estimate', 'stage', 'actions');
 $config->productplan->defaultFields['bug']       = array('id', 'title', 'pri', 'status', 'openedBy', 'assignedTo', 'actions');
 $config->productplan->defaultFields['linkStory'] = array('id', 'pri', 'plan', 'module', 'title', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage');
diff --git a/module/productplan/config/search.php b/module/productplan/config/search.php
new file mode 100644
index 0000000000..b04d0c52b5
--- /dev/null
+++ b/module/productplan/config/search.php
@@ -0,0 +1,18 @@
+<?php
+global $lang;
+$config->productplan->search['module'] = 'productplan';
+
+$config->productplan->search['fields']['title']  = $lang->productplan->title;
+$config->productplan->search['fields']['id']     = $lang->productplan->id;
+$config->productplan->search['fields']['branch'] = $lang->productplan->branch;
+$config->productplan->search['fields']['status'] = $lang->productplan->status;
+$config->productplan->search['fields']['begin']  = $lang->productplan->begin;
+$config->productplan->search['fields']['end']    = $lang->productplan->end;
+
+$config->productplan->search['params']['id']     = array('operator' => '=',       'control' => 'input',  'values' => '');
+$config->productplan->search['params']['title']  = array('operator' => 'include', 'control' => 'input',  'values' => '');
+$config->productplan->search['params']['branch'] = array('operator' => 'include', 'control' => 'select', 'values' => '');
+$config->productplan->search['params']['status'] = array('operator' => '=',       'control' => 'select', 'values' => $lang->productplan->statusList);
+$config->productplan->search['params']['begin']  = array('operator' => '=',       'control' => 'input',  'values' => '', 'class' => 'date');
+$config->productplan->search['params']['end']    = array('operator' => '=',       'control' => 'input',  'values' => '', 'class' => 'date');
+
diff --git a/module/productplan/ui/view.html.php b/module/productplan/ui/view.html.php
index 053ef71a56..4a813d79d0 100644
--- a/module/productplan/ui/view.html.php
+++ b/module/productplan/ui/view.html.php
@@ -267,7 +267,7 @@ detailBody
                     item(set::name($lang->productplan->desc), empty($plan->desc) ? $lang->noData : html(($plan->desc)))
                 ),
                 h::hr(setClass('mt-4')),
-                history(set::commentBtn(false))
+                history(set::objectID($plan->id), set::commentBtn(false))
             )
         )
     )
diff --git a/module/testtask/ui/linkcase.html.php b/module/testtask/ui/linkcase.html.php
index 05761e6e93..b527187e70 100644
--- a/module/testtask/ui/linkcase.html.php
+++ b/module/testtask/ui/linkcase.html.php
@@ -68,7 +68,7 @@ featureBar
     set::current($type),
     set::linkParams("taskID={$task->id}&type={key}"),
     to::before(backBtn(set::icon('back'), set::className('btn secondary'), $lang->goback)),
-    li(searchToggle())
+    li(searchToggle(set::module('testcase'), set::open($type == 'bySearch')))
 );
 
 $footToolbar = array('items' => array
diff --git a/module/testtask/zen.php b/module/testtask/zen.php
index 460c56df64..567d3e99d4 100644
--- a/module/testtask/zen.php
+++ b/module/testtask/zen.php
@@ -81,7 +81,7 @@ class testtaskZen extends testtask
 
         $searchConfig = $this->config->testcase->search;
         $searchConfig['style']                       = 'simple';
-        $searchConfig['actionURL']                   = inlink('linkcase', "taskID={$task->id}&type={$type}&param={$param}");
+        $searchConfig['actionURL']                   = inlink('linkcase', "taskID={$task->id}&type=bySearch&param={$param}");
         $searchConfig['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($product->id, 'case', 0, $task->branch);
         $searchConfig['params']['scene']['values']   = $this->testcase->getSceneMenu($product->id);
         $searchConfig['params']['product']['values'] = array($product->id => $product->name);