diff --git a/apps/desktop/src/components/connection/ConnectionDialog.vue b/apps/desktop/src/components/connection/ConnectionDialog.vue
index b935791e6..75895a096 100644
--- a/apps/desktop/src/components/connection/ConnectionDialog.vue
+++ b/apps/desktop/src/components/connection/ConnectionDialog.vue
@@ -2556,7 +2556,7 @@ function openExternalUrl(url: string) {
                       </p>
                     </div>
                   </div>
-                  <template v-if="form.db_type === 'h2'">
+                  <template v-if="form.db_type === 'h2' || form.db_type === 'access'">
                     <div class="grid grid-cols-4 items-center gap-4">
                       <Label class="text-right">{{ t("connection.user") }}</Label>
                       <Input v-model="form.username" class="col-span-3" placeholder="sa" />
diff --git a/apps/desktop/src/components/layout/AppToolbar.vue b/apps/desktop/src/components/layout/AppToolbar.vue
index db11f71f6..133e08900 100644
--- a/apps/desktop/src/components/layout/AppToolbar.vue
+++ b/apps/desktop/src/components/layout/AppToolbar.vue
@@ -243,6 +243,7 @@ const collapsedItems = computed(() => [
 
     <template v-if="toolbarCollapsed">
       <LightDropdown
+        model-value=""
         :items="collapsedItems"
         :aria-label="t('common.more')"
         :trigger-icon="Ellipsis"
diff --git a/apps/desktop/src/lib/datagripImport.ts b/apps/desktop/src/lib/datagripImport.ts
index 6c5a98034..273e5ddbf 100644
--- a/apps/desktop/src/lib/datagripImport.ts
+++ b/apps/desktop/src/lib/datagripImport.ts
@@ -1,6 +1,8 @@
 import type { ConnectionConfig, DatabaseType } from "@/types/database";
 import { uuid } from "@/lib/utils";
 
+declare var process: { env: Record<string, string | undefined> } | undefined;
+
 type PartialConnection = Omit<ConnectionConfig, "id">;
 
 export type DataGripImportPayload = {
diff --git a/apps/desktop/src/lib/sidebarActiveTabTarget.ts b/apps/desktop/src/lib/sidebarActiveTabTarget.ts
index 6fb7c6453..fda77fb80 100644
--- a/apps/desktop/src/lib/sidebarActiveTabTarget.ts
+++ b/apps/desktop/src/lib/sidebarActiveTabTarget.ts
@@ -24,6 +24,10 @@ export type ActiveTabSidebarTarget =
       connectionId: string;
       database: string;
       schema?: string;
+    }
+  | {
+      type: "saved-sql-file";
+      savedSqlId: string;
     };
 
 export function activeTabSidebarTarget(tab: QueryTab | undefined | null): ActiveTabSidebarTarget | null {
@@ -56,6 +60,10 @@ export function activeTabSidebarTarget(tab: QueryTab | undefined | null): Active
     return { type: "etcd-root", connectionId: tab.connectionId };
   }
 
+  if (tab.savedSqlId) {
+    return { type: "saved-sql-file", savedSqlId: tab.savedSqlId };
+  }
+
   if (tab.mode === "query") {
     if (!tab.connectionId || !tab.database) return null;
     return {
@@ -100,6 +108,10 @@ export function matchesTarget(node: TreeNode, target: ActiveTabSidebarTarget): b
     return node.type === "etcd-root" && node.connectionId === target.connectionId;
   }
 
+  if (target.type === "saved-sql-file") {
+    return node.type === "saved-sql-file" && node.savedSqlId === target.savedSqlId;
+  }
+
   return (
     (node.type === "table" || node.type === "view") &&
     node.connectionId === target.connectionId &&
diff --git a/apps/desktop/src/lib/sidebarNodeOrdering.ts b/apps/desktop/src/lib/sidebarNodeOrdering.ts
index 3aa5a3ff3..0089920c8 100644
--- a/apps/desktop/src/lib/sidebarNodeOrdering.ts
+++ b/apps/desktop/src/lib/sidebarNodeOrdering.ts
@@ -31,9 +31,12 @@ export function sortSidebarTreeChildrenForParent(
   }
 
   if (parent.type === "connection") {
+    const savedSqlNodes = normalized.filter((child) => child.type === "saved-sql-root");
     const userAdminNodes = normalized.filter((child) => child.type === "user-admin");
-    const regularChildren = normalized.filter((child) => child.type !== "user-admin");
-    const withConnectionUtilityOrder = (children: TreeNode[]) => [...children, ...userAdminNodes];
+    const regularChildren = normalized.filter(
+      (child) => child.type !== "user-admin" && child.type !== "saved-sql-root",
+    );
+    const withConnectionUtilityOrder = (children: TreeNode[]) => [...savedSqlNodes, ...children, ...userAdminNodes];
 
     if (databaseType === "mongodb" || databaseType === "elasticsearch") {
       return withConnectionUtilityOrder(sortByLabel(regularChildren));
diff --git a/apps/desktop/src/lib/sidebarTreeItemLayout.ts b/apps/desktop/src/lib/sidebarTreeItemLayout.ts
index 06a702c15..f92000ba4 100644
--- a/apps/desktop/src/lib/sidebarTreeItemLayout.ts
+++ b/apps/desktop/src/lib/sidebarTreeItemLayout.ts
@@ -13,10 +13,13 @@ const leafTypes: Set<TreeNodeType> = new Set([
   "redis-db",
   "mongo-collection",
   "user-admin",
+  "saved-sql-file",
 ]);
 
 const fullWidthLabelTypes: Set<TreeNodeType> = new Set(["table", "view", "mongo-collection"]);
 
+const emptyContainerTypes: Set<TreeNodeType> = new Set(["saved-sql-root", "saved-sql-folder"]);
+
 export function treeItemPaddingLeft(depth: number): string {
   return `${depth * 16 + 8}px`;
 }
@@ -29,13 +32,8 @@ export function canTreeNodeExpand(type: TreeNodeType): boolean {
   return !leafTypes.has(type);
 }
 
-export function canTreeNodeShowExpander({
-  type,
-  childCount: _childCount,
-}: {
-  type: TreeNodeType;
-  childCount?: number;
-}): boolean {
+export function canTreeNodeShowExpander({ type, childCount }: { type: TreeNodeType; childCount?: number }): boolean {
   if (!canTreeNodeExpand(type)) return false;
+  if (childCount === 0 && emptyContainerTypes.has(type)) return false;
   return true;
 }
diff --git a/apps/desktop/src/lib/treeNodeClick.ts b/apps/desktop/src/lib/treeNodeClick.ts
index 2d848b231..204b7ce58 100644
--- a/apps/desktop/src/lib/treeNodeClick.ts
+++ b/apps/desktop/src/lib/treeNodeClick.ts
@@ -17,6 +17,7 @@ const dataNodeTypes = new Set<TreeNodeType>(["table", "view"]);
 const toggleLeafNodeTypes = new Set<TreeNodeType>(["redis-db", "mongo-collection", "user-admin"]);
 const objectBrowserNodeTypes = new Set<TreeNodeType>(["database", "schema", "object-browser"]);
 const sourceNodeTypes = new Set<TreeNodeType>(["procedure", "function", "sequence", "package", "package-body"]);
+const savedSqlNodeTypes = new Set<TreeNodeType>(["saved-sql-file"]);
 const tableChildGroupNodeTypes = new Set<TreeNodeType>([
   "group-columns",
   "group-indexes",
@@ -64,6 +65,7 @@ export function treeNodeRowDoubleClickAction(
   if (activation === "double") {
     if (dataNodeTypes.has(type)) return "open-data";
     if (sourceNodeTypes.has(type)) return "open-source";
+    if (savedSqlNodeTypes.has(type)) return "open-saved-sql";
     if (toggleLeafNodeTypes.has(type)) return "toggle";
     if (canOpenObjectBrowser && objectBrowserNodeTypes.has(type) && canExpand) return "open-object-browser-and-expand";
     if (canOpenObjectBrowser && objectBrowserNodeTypes.has(type)) return "open-object-browser";
diff --git a/crates/dbx-core/src/db/turso_driver.rs b/crates/dbx-core/src/db/turso_driver.rs
index e69c61454..1f4f9acd1 100644
--- a/crates/dbx-core/src/db/turso_driver.rs
+++ b/crates/dbx-core/src/db/turso_driver.rs
@@ -674,6 +674,7 @@ mod tests {
     }
 
     #[test]
+    #[allow(clippy::approx_constant)]
     fn turso_value_float_parsed() {
         let v = TursoValue { value_type: "float".to_string(), value: Some(serde_json::json!("3.14")) };
         assert_eq!(turso_value_to_json(v), serde_json::json!(3.14));
diff --git a/packages/node-core/src/diagnostics.ts b/packages/node-core/src/diagnostics.ts
index 6bd4707a1..94a44113a 100644
--- a/packages/node-core/src/diagnostics.ts
+++ b/packages/node-core/src/diagnostics.ts
@@ -31,6 +31,7 @@ export const BRIDGE_REQUIRED_TYPES = [
   "sqlserver",
   "oracle",
   "elasticsearch",
+  "etcd",
   "dameng",
   "kingbase",
   "highgo",