diff --git a/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts b/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts
index d814694481..d07369760e 100644
--- a/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts
+++ b/webapp/packages/core-app/src/shared/NodesManager/NavTreeResource.ts
@@ -80,7 +80,7 @@ export class NavTreeResource extends CachedMapResource<string, string[]> {
     }));
 
     permissionsResource.require(this, EPermission.public);
-    this.preloadResource(connectionInfo, () => CachedMapAllKey);
+    // this.preloadResource(connectionInfo, () => CachedMapAllKey);
 
     this.onNodeRefresh = new Executor<string>(null, (a, b) => a === b);
 
diff --git a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditor/SQLCodeEditorController.ts b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditor/SQLCodeEditorController.ts
index cc4786d3cc..fd6f2acbce 100644
--- a/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditor/SQLCodeEditorController.ts
+++ b/webapp/packages/plugin-sql-editor/src/SqlEditor/SQLCodeEditor/SQLCodeEditorController.ts
@@ -53,13 +53,7 @@ export class SQLCodeEditorController {
 
     if (this.dialect?.dataTypes) {
       for (const key of this.dialect.dataTypes) {
-        keywords[key.toLowerCase()] = true;
-      }
-    }
-
-    if (this.dialect?.reservedWords) {
-      for (const key of this.dialect.reservedWords) {
-        keywords[key.toLowerCase()] = true;
+        builtin[key.toLowerCase()] = true;
       }
     }
 
@@ -69,6 +63,12 @@ export class SQLCodeEditorController {
       }
     }
 
+    if (this.dialect?.reservedWords) {
+      for (const key of this.dialect.reservedWords) {
+        keywords[key.toLowerCase()] = true;
+      }
+    }
+
     return {
       name,
       keywords,