diff --git a/Projects/Superalgos/Schemas/Docs-Topics/docs-basics-002-docs-page-category.json b/Projects/Superalgos/Schemas/Docs-Topics/docs-basics-002-docs-page-category.json
index af6cf71a2..568293e93 100644
--- a/Projects/Superalgos/Schemas/Docs-Topics/docs-basics-002-docs-page-category.json
+++ b/Projects/Superalgos/Schemas/Docs-Topics/docs-basics-002-docs-page-category.json
@@ -3,8 +3,8 @@
     "pageNumber": "2",
     "type": "Docs Page Category",
     "definition": {
-        "text": "The Docs have 3 different categories of pages. Node, Concept and Topic.",
-        "updated": 1609150759942
+        "text": "The Docs have 3 different categories of pages. Node, Concept and Topic. Each of them is a collection of pages users can read.",
+        "updated": 1609161546617
     },
     "paragraphs": [
         {
diff --git a/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-010-docs-command-errors.json b/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-010-docs-command-errors.json
index 73c445587..a4ff3f206 100644
--- a/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-010-docs-command-errors.json
+++ b/Projects/Superalgos/Schemas/Docs-Topics/docs-commands-010-docs-command-errors.json
@@ -27,7 +27,16 @@
         },
         {
             "style": "Success",
-            "text": "Check the command syntax for a detailed list of parameters required."
+            "text": "  Check the command syntax for a detailed list of parameters required.",
+            "updated": 1609160562426
+        },
+        {
+            "style": "Text",
+            "text": "     "
+        },
+        {
+            "style": "Text",
+            "text": ""
         },
         {
             "style": "Anchor",
@@ -47,8 +56,42 @@
             "text": "Check that you typed the Project name correctly. Project names are key-sensitive."
         },
         {
-            "style": "Text",
-            "text": "3"
+            "style": "Anchor",
+            "text": "Anchor Category Not Valid",
+            "updated": 1609160863036
+        },
+        {
+            "style": "Title",
+            "text": "Category not valid",
+            "updated": 1609160881861
+        },
+        {
+            "style": "Error",
+            "text": "The category you have specidied is not a valid Docs Page Category.",
+            "updated": 1609160924575
+        },
+        {
+            "style": "Success",
+            "text": " Valid categories are: Node, Concept and Topic. This parameter is key-sensitive.",
+            "updated": 1609161108040
+        },
+        {
+            "style": "Anchor",
+            "text": "Anchor Page Not Found",
+            "updated": 1609161391540
+        },
+        {
+            "style": "Title",
+            "text": "Page not found"
+        },
+        {
+            "style": "Error",
+            "text": "The Docs Page Name you have specified could not be found in the collection of pages of the Docs Page Category you provided."
+        },
+        {
+            "style": "Success",
+            "text": "Double check that the Docs Page Name is spelled correctly and that it belongs to the Docs Page Category provided. ",
+            "updated": 1609161473688
         },
         {
             "style": "Text",
diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
index b580a4c3a..b7a62eecc 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
@@ -1030,12 +1030,12 @@ function newSuperalgosDocSpace() {
                     break
                 }
                 default: {
-                    renderCommandResultsPage(["Syntax Error. Expected <b>Node</b>, <b>Concept</b> or <b>Topic</b>. Found <b>" + category + "</b>"])
+                    navigateTo('Superalgos', 'Topic', 'Docs Command Errors', 'Anchor Category Not Valid')
                     return
                 }
             }
             if (docsSchemaDocument === undefined) {
-                renderCommandResultsPage([category + " <b>" + type + "</b> does not exist."])
+                navigateTo('Superalgos', 'Topic', 'Docs Command Errors', 'Anchor Page Not Found')
                 return
             }
             if (docsSchemaDocument.paragraphs === undefined) {
@@ -2922,6 +2922,7 @@ function newSuperalgosDocSpace() {
                         role = 'role="alert"'
                         key = key + '-error'
                         innerHTML = getTextBasedOnLanguage(paragraph)
+                        innerHTML = addToolTips(innerHTML)
                         innerHTML = innerHTML + addWarningIfTranslationIsOutdated(paragraph)
                         break
                     }