diff --git a/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-errors-017-no-matching-topic-or-tutorial-found.json b/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-errors-017-no-matching-topic-or-tutorial-found.json
new file mode 100644
index 000000000..e6f5dd070
--- /dev/null
+++ b/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-errors-017-no-matching-topic-or-tutorial-found.json
@@ -0,0 +1,30 @@
+{
+    "topic": "Docs Commands Errors",
+    "pageNumber": "17",
+    "type": "No Matching Topic Or Tutorial Found",
+    "definition": {
+        "text": "The Topic or Tutorial you specified did not produce any match of pages within that Topic or Tutorial.",
+        "updated": 1610398888306
+    },
+    "paragraphs": [
+        {
+            "style": "Error",
+            "text": "No pages found. There are no Topics or Tutorials with the name provided.",
+            "updated": 1610398925565
+        },
+        {
+            "style": "Success",
+            "text": "Tip: Check that the name Topic or Tutorial name provided is correctly spelled.",
+            "updated": 1610398957505
+        },
+        {
+            "style": "Title",
+            "text": "Applies to"
+        },
+        {
+            "style": "List",
+            "text": "Docs Repaginate Command",
+            "updated": 1610398971728
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-topic-frame-it-flexibly.json b/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-002-tutorial-topic-frame-it-flexibly.json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-topic-frame-it-flexibly.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-002-tutorial-topic-frame-it-flexibly.json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-ready-for-the-next one.json b/Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-are-you-ready-for the next one.json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-ready-for-the-next one.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/1.-intro-to-trading-systems-015-tutorial-step-are-you-ready-for the next one.json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-the-pipeline.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-002-tutorial-step- the pipeline.json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-the-pipeline.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-002-tutorial-step- the pipeline.json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data..json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-004-tutorial-step- lets mine some data..json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-reinforce-the-learning.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-014-tutorial-step- reinforce the learning.json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/tutorial-step-reinforce-the-learning.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-014-tutorial-step- reinforce the learning.json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- are we up to date.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- we need data.json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- are we up to date.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-015-tutorial-step- we need data.json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest..json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-031-tutorial-step- first backtest..json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this..json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-033-tutorial-step- lets do this..json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event..json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-055-tutorial-step- take position event..json
diff --git a/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do this.json b/Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do it.json
similarity index 100%
rename from Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do this.json
rename to Projects/Superalgos/Schemas/Docs-Tutorials/3.-testing-a-trading-idea-the-trigger-stage-065-tutorial-step- lets do it.json
diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js b/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js
index 99a19161b..66e155ebc 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/CommandInterface.js
@@ -550,27 +550,17 @@ function newSuperalgosDocsCommmandInterface() {
                 query
             )
 
+            if (orderedArray.length = 0) {
+                UI.projects.superalgos.spaces.docsSpace.navigateTo('Superalgos', 'Topic', 'No Matching Topic Or Tutorial Found')
+                return
+            }
+
             let pageNumber = 1
             for (let i = 0; i < orderedArray.length; i++) {
                 schemaDocument = orderedArray[i]
-                switch (category) {
-                    case 'Topic': {
-                        if (schemaDocument.topic === query) {
-                            schemaDocument.pageNumber = pageNumber
-                            pageNumber++
-                            schemaDocument.updated = true
-                        }
-                        break
-                    }
-                    case 'Tutorial': {
-                        if (schemaDocument.tutorial === query) {
-                            schemaDocument.pageNumber = pageNumber
-                            pageNumber++
-                            schemaDocument.updated = true
-                        }
-                        break
-                    }
-                }
+                schemaDocument.pageNumber = pageNumber
+                pageNumber++
+                schemaDocument.updated = true
             }
             UI.projects.superalgos.spaces.docsSpace.navigateTo('Superalgos', 'Topic', 'Docs Message Repagination Succeed')
         }
diff --git a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js
index 45c452d7d..3c255939f 100644
--- a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js
+++ b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js
@@ -1265,6 +1265,16 @@ function newSuperalgosTutorialSpace() {
                         html = html + '<div class="tutorial-font-small">' + text + '</div>'
                         break
                     }
+                    case 'Json': {
+                        let text = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)  
+                        html = html + '<pre><code class="language-json">' + text + '</code></pre>'
+                        break
+                    }
+                    case 'Javascript': {
+                        let text = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)  
+                        html = html + '<pre><code class="language-json">' + text + '</code></pre>'
+                        break
+                    }
                     case 'List': {
                         let text = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph)  
                         text = UI.projects.superalgos.utilities.docs.addKeyboard(text)