diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 5f9f2fbee6..479c859ff2 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -84,3 +84,5 @@ td.c-name a:visited{color: #082999}
 #createDropdown ul.dropdown-menu{width:100%;}
 
 .color-darkblue{background:rgb(0,0,139)}
+.color-darkblue:hover{background:rgb(0,0,139)}
+.color-darkblue:focus{background:rgb(0,0,139)}
diff --git a/module/doc/model.php b/module/doc/model.php
index cb24447ca1..c2bfef3cb6 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -147,13 +147,15 @@ class docModel extends model
         }
         elseif($type == 'all')
         {
-            /* Show all undeleted doclibs,if display settings selected shows only unclosed projects then shows only unclosed projects doclibs. */
-            $undoneSql = $this->dao->select('id')->from(TABLE_PROJECT)->where('deleted')->eq(0)->andWhere('status')->notin('done,closed')->get();
-            $stmt      = $this->dao->select('*')->from(TABLE_DOCLIB)
+            /* If extra have unclosedProject then ignore unclosed project libs. */
+            $unclosedProjects = array();
+            if(strpos($extra, 'unclosedProject') !== false) $unclosedProjects = $this->dao->select('id')->from(TABLE_PROJECT)->where('deleted')->eq(0)->andWhere('status')->notin('done,closed')->fetchPairs('id', 'id');
+
+            $stmt = $this->dao->select('*')->from(TABLE_DOCLIB)
                 ->where('deleted')->eq(0)
                 ->beginIF(strpos($extra, 'unclosedProject') !== false)
                 ->andWhere('project', true)->eq('0')
-                ->orWhere("project IN ($undoneSql)")
+                ->orWhere('project')->in($unclosedProjects)
                 ->markRight(1)
                 ->fi()
                 ->orderBy('`order`,id desc')