diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
index 389a30fd4..42701a961 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
@@ -769,44 +769,27 @@ function newSuperalgosDocSpace() {
             // Results
             HTML = HTML + '<div class="docs-search-result-content">'
 
-            // All Tab
-            HTML = HTML + '<div id="content1">'
+            for (let i = 0; i < tabs.length; i++) {
+                let tab = tabs[i]
+                HTML = HTML + '<div id="content' + (i + 1) + '">'
 
-            for (let i = 0; i < resultsArary.length; i++) {
-                let result = resultsArary[i]
+                for (let j = 0; j < resultsArary.length; j++) {
+                    let result = resultsArary[j]
 
-                HTML = HTML + '<div class="docs-search-result-content-record-container">'
-                HTML = HTML + '<p class="docs-search-result-content-record-project-category">' + result.documentIndex.project + ' > ' + result.documentIndex.documentCategory + '</p>'
-                HTML = HTML + '<p><a onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'' + result.documentIndex.documentCategory + '\', \'' + result.documentIndex.document.type + '\', \'' + result.documentIndex.project + '\')" class="docs-search-result-content-record-title">' + result.documentIndex.document.type + '</a></p>'
-                HTML = HTML + '<p class="docs-search-result-content-record-extract">' + result.documentIndex.document.definition + '</p>'
+                    if (tab !== 'All') {
+                        if (tab.indexOf(result.documentIndex.documentCategory) < 0) {
+                            continue
+                        }
+                    }
+
+                    HTML = HTML + '<div class="docs-search-result-content-record-container">'
+                    HTML = HTML + '<p class="docs-search-result-content-record-project-category">' + result.documentIndex.project + ' > ' + result.documentIndex.documentCategory + '</p>'
+                    HTML = HTML + '<p><a onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'' + result.documentIndex.documentCategory + '\', \'' + result.documentIndex.document.type + '\', \'' + result.documentIndex.project + '\')" class="docs-search-result-content-record-title">' + result.documentIndex.document.type + '</a></p>'
+                    HTML = HTML + '<p class="docs-search-result-content-record-extract">' + result.documentIndex.document.definition + '</p>'
+                    HTML = HTML + '</div>'
+                }
                 HTML = HTML + '</div>'
             }
-            // const TOOL_TIP_HTML = '<div onClick="UI.projects.superalgos.spaces.docsSpace.navigateTo(\'CATEGORY\', \'TYPE\', \'PROJECT\')" class="docs-tooltip">TYPE_LABEL<span class="docs-tooltiptext">DEFINITION</span></div>'
-
-            HTML = HTML + '</div>'
-
-            // Nodes Tab
-            HTML = HTML + '<div id="content2">'
-
-            HTML = HTML + '<div class="docs-search-result-content-record-container">'
-            HTML = HTML + '<p class="docs-search-result-content-record-project-category">Superalgos > Node</p>'
-            HTML = HTML + '<p><a class="docs-search-result-content-record-title" href="data-storage.html">Data Storage</a></p>'
-            HTML = HTML + '<p class="docs-search-result-content-record-extract">The data storage node holds the definitions as to what data is stored in the corresponding network node.</p>'
-            HTML = HTML + '</div>'
-
-            HTML = HTML + '<div class="docs-search-result-content-record-container">'
-            HTML = HTML + '<p class="docs-search-result-content-record-project-category">Superalgos > Node</p>'
-            HTML = HTML + '<p><a class="docs-search-result-content-record-title" href="data-mines-data.html">Data Mines Data</a></p>'
-            HTML = HTML + '<p class="docs-search-result-content-record-extract">Session independent data refers to data generated by sensors and indicators, not related to trading sessions.</p>'
-            HTML = HTML + '</div>'
-
-            HTML = HTML + '<div class="docs-search-result-content-record-container">'
-            HTML = HTML + '<p class="docs-search-result-content-record-project-category">Superalgos > Node</p>'
-            HTML = HTML + '<p><a class="docs-search-result-content-record-title" href="trading-mines-data.html">Trading Mines Data</a></p>'
-            HTML = HTML + '<p class="docs-search-result-content-record-extract">Session-based data refers to data that is generated as a consequence of running a trading session, that is, data the trading bot instance generates while running backtesting, paper trading, forward testing, or live trading sessions.</p>'
-            HTML = HTML + '</div>'
-
-            HTML = HTML + '</div>'
 
             // End Content
             HTML = HTML + '</div>'