diff --git a/module/doc/control.php b/module/doc/control.php
index 6a10db5146..00d449e5b2 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -70,7 +70,6 @@ class doc extends control
         $this->session->set('productList', $uri, 'product');
         $this->session->set('executionList', $uri, 'execution');
         $this->session->set('projectList', $uri, 'project');
-        $this->session->set('objectName', '', 'doc');
         $this->session->set('spaceType', 'mine', 'doc');
         $this->loadModel('search');
 
@@ -1300,7 +1299,7 @@ class doc extends control
         if($libType == 'api')
         {
             $this->loadModel('api');
-            $this->session->set('objectName', $this->lang->doc->api, 'admin');
+            $this->session->set('objectName', $this->lang->doc->api, 'doc');
 
             $this->view->libs    = $libs;
             $this->view->apiID   = 0;
@@ -1309,8 +1308,7 @@ class doc extends control
         }
         else
         {
-            if(in_array($type, array('product', 'project'))) $this->session->set('objectName', $this->lang->doc->common, 'admin');
-            if($this->config->vision == 'lite' or in_array($type, array('execution', 'custom'))) $this->session->set('objectName', '', 'admin');
+            if(in_array($type, array('product', 'project'))) $this->session->set('objectName', $this->lang->doc->common, 'doc');
             $this->view->docs = $browseType == 'bySearch' ? $this->doc->getDocsBySearch($type, $objectID, $libID, $queryID, $orderBy, $pager) : $this->doc->getDocs($libID, $moduleID, $browseType, $orderBy, $pager);
         }
 
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 81483d0f0f..bff52b8d7b 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -112,3 +112,5 @@ ol, ul {margin-bottom: 0}
 #outlineMenu {background: #fff; position: absolute; height: calc(100vh - 180px)!important; overflow-y: auto; top: 50px; right: 25px;}
 .pl-0px {padding-left:0px !important;}
 .icon {cursor: pointer;}
+
+#queryBox .btn-save-form, #queryBox #toggle-queries{display: none;}
diff --git a/module/my/css/doc.css b/module/my/css/doc.css
index 76d7aeb2e2..22d5b6f611 100644
--- a/module/my/css/doc.css
+++ b/module/my/css/doc.css
@@ -11,3 +11,4 @@ body {margin-bottom: 25px;}
 #docList .btn {padding: 0 2px;}
 #docList .ajaxCollect {width: 30px; padding: 0 6px;}
 .btn.ajaxCollect > img {width: 20px;}
+#queryBox .btn-save-form, #queryBox #toggle-queries{display: none;}
diff --git a/module/search/config.php b/module/search/config.php
index a87b3e7733..243030c6d8 100644
--- a/module/search/config.php
+++ b/module/search/config.php
@@ -151,3 +151,12 @@ $config->search->recPerPage = 10;
 /* Set the length of summary of search results. */
 $config->search->summaryLength = 120;
 $config->search->maxFileSize   = 1024;
+
+if($config->vision == 'lite')
+{
+    $config->search->searchObject = array('trash', 'productlibDoc', 'productapiDoc', 'projectlibDoc', 'projectapiDoc');
+}
+else
+{
+    $config->search->searchObject = array('trash');
+}
diff --git a/module/search/control.php b/module/search/control.php
index 281044b579..bb0e45f202 100644
--- a/module/search/control.php
+++ b/module/search/control.php
@@ -49,7 +49,7 @@ class search extends control
         $_SESSION['searchParams']['module'] = $module;
         $this->search->initSession($module, $fields, $params);
 
-        if(($module == 'trash' or substr($module, -3) == 'Doc') and $this->session->objectName)
+        if(in_array($module, $this->config->search->searchObject) and $this->session->objectName)
         {
             $space = common::checkNotCN() ? ' ' : '';
             $this->lang->search->common = $this->lang->search->common . $space . $this->session->objectName;