diff --git a/module/api/model.php b/module/api/model.php
index 75500fbe95..fcff050453 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -911,6 +911,7 @@ class apiModel extends model
      */
     public function buildSearchForm($lib, $queryID, $actionURL, $libs = array(), $type = '')
     {
+        if(empty($lib)) return;
         $libPairs = array('' => '', $lib->id => $lib->name);
         $this->config->api->search['module'] = 'api';
         if(!empty($libs))
diff --git a/module/doc/css/tablecontents.css b/module/doc/css/tablecontents.css
index ac6c164744..beee0e6595 100644
--- a/module/doc/css/tablecontents.css
+++ b/module/doc/css/tablecontents.css
@@ -12,6 +12,7 @@
 #mainContent #createDropdown ul {position: absolute;}
 #pageNav .dropdown-menu {max-height: inherit;}
 #mainContent > .panel {margin-bottom: 0; height: calc(100vh - 125px); overflow-y: auto;}
+#mainContent > .main-col {overflow-x: hidden;}
 
 .no-content {width: 100px; height: 100px; margin: 0 auto;}
 .notice {text-align: center; padding-left: 15px; padding-top: 20px;}
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index 3dffea9551..401843775d 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -17,7 +17,9 @@
 <div id="mainMenu" class="clearfix">
   <div id="leftBar" class="btn-toolbar pull-left">
     <?php echo $objectDropdown;?>
+    <?php if(!empty($libTree)):?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->doc->searchDoc;?></a>
+    <?php endif;?>
   </div>
   <div class="btn-toolbar pull-right">
   <?php
diff --git a/module/tree/model.php b/module/tree/model.php
index ec097f9200..592576cf34 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -2331,7 +2331,7 @@ class treeModel extends model
         $module->name   = strip_tags(trim($data->name));
         if(empty($module->name))
         {
-            dao::$errors[] = sprintf($this->lang->notempty, $this->lang->tree->dir);
+            dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->tree->dir);
             return false;
         }