diff --git a/module/api/control.php b/module/api/control.php
index 62561e69ee..f526cdf16f 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -111,7 +111,6 @@ class api extends control
         }
 
         $this->view->lib            = $lib;
-        $this->view->isRelease      = $release > 0;
         $this->view->release        = $release;
         $this->view->title          = $this->lang->api->pageTitle;
         $this->view->libID          = $libID;
diff --git a/module/api/model.php b/module/api/model.php
index 102adb44ff..f11580ed80 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -1039,7 +1039,6 @@ class apiModel extends model
      * @param  int    $moduleID
      * @param  int    $objectID
      * @param  string $browseType bySearch
-
      * @access public
      * @return array
      */
@@ -1051,18 +1050,16 @@ class apiModel extends model
         foreach($libTree as &$tree)
         {
             $tree->versions    = array();
-            $tree->lastVersion = '';
             foreach($releases as $index => $release)
             {
                 if($tree->id == $release->lib)
                 {
-                    if(empty($tree->versions)) $tree->lastVersion = $release->version;
-
-                    $tree->versions[] = $release->version;
+                    $tree->versions[] = $release;
                     unset($releases[$index]);
                 }
             }
         }
+
         return $libTree;
     }
 }
diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
index 55b23436b7..393a2dc159 100644
--- a/module/doc/view/lefttree.html.php
+++ b/module/doc/view/lefttree.html.php
@@ -49,6 +49,15 @@
 #leftBar .selectBox #currentItem > .text {overflow: hidden; text-align: left; flex: 0 1 100%;}
 </style>
 
+<?php
+/* Release used for api space. */
+js::set('release',    isset($release) ? $release : 0);
+
+/* ObjectType and objectID used for other space. */
+js::set('objectType', isset($type) ? $type : '');
+js::set('objectID',   isset($objectID) ? $objectType : '');
+?>
+
 <div id="fileTree" class="file-tree">
 <?php if(isset($type) and $type == 'project'):?>
 <div class="project-tree">
@@ -134,6 +143,8 @@ $(function()
         var dropdown = '<ul class="dropdown-menu dropdown-in-tree" id="' + option.type + '" style="display: unset; left:' + option.left + 'px; top:' + option.top + 'px;">';
         dropdown += $(libClass).html().replace(/%libID%/g, option.libID).replace(/%moduleID%/g, option.moduleID).replace(/%hasChildren%/g, option.hasChildren);
         dropdown += '</ul>';
+
+        if(typeof(option.moduleType) != 'undefined' && option.moduleType == 'api') dropdown = dropdown.replace(/doc/g, 'api');
         return dropdown;
     }
 
@@ -221,7 +232,8 @@ $(function()
                 type        : dropDownID,
                 libID       : libID,
                 moduleID    : moduleID,
-                hasChildren : hasChildren
+                hasChildren : hasChildren,
+                moduleType  : moduleType
             };
 
             var dropDown = renderDropdown(option);
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index d95fd05250..dfe60e5b67 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -15,8 +15,6 @@
 <?php js::set('linkParams', "type=$type&objectID=$objectID%s");?>
 <?php js::set('docLang', $lang->doc);?>
 <?php js::set('libType', 'annex');?>
-<?php js::set('objectType', $type);?>
-<?php js::set('objectID', $objectID);?>
 <?php js::set('canViewFiles', common::hasPriv('doc', 'showfiles'));?>
 <?php js::set('type', $type);?>
 <?php js::set('tab', $this->app->tab);?>
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index d8c5109f0f..51a943c8ad 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -15,8 +15,6 @@
 <?php js::set('linkParams', "type=$type&objectID=$objectID%s&browseType=&orderBy=$orderBy");?>
 <?php js::set('docLang', $lang->doc);?>
 <?php js::set('libType', $libType);?>
-<?php js::set('objectType', $type);?>
-<?php js::set('objectID', $objectID);?>
 <?php js::set('canViewFiles', common::hasPriv('doc', 'showfiles'));?>
 <div id="mainMenu" class="clearfix">
   <div id="leftBar" class="btn-toolbar pull-left">