diff --git a/package-lock.json b/package-lock.json
index d94058c5ce..1392940ea3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "trilium",
-  "version": "0.61.10-beta",
+  "version": "0.61.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "trilium",
-      "version": "0.61.10-beta",
+      "version": "0.61.13",
       "hasInstallScript": true,
       "license": "AGPL-3.0-only",
       "dependencies": {
@@ -47,7 +47,7 @@
         "jimp": "0.22.10",
         "joplin-turndown-plugin-gfm": "1.0.12",
         "jsdom": "22.1.0",
-        "marked": "9.1.2",
+        "marked": "9.1.6",
         "mime-types": "2.1.35",
         "multer": "1.4.5-lts.1",
         "node-abi": "3.50.0",
@@ -79,7 +79,7 @@
       },
       "devDependencies": {
         "cross-env": "7.0.3",
-        "electron": "25.9.2",
+        "electron": "25.9.5",
         "electron-builder": "24.6.4",
         "electron-packager": "17.1.2",
         "electron-rebuild": "3.2.9",
@@ -4276,9 +4276,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "25.9.2",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.2.tgz",
-      "integrity": "sha512-hVBN5rsrL99BKNHvzMeYy2PkAmewuIobu4U3o3EzVz4MDoLmMfW4yTH5GZ4RbJrpokoEky5IzGtRR/ggPzL6Fw==",
+      "version": "25.9.5",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.5.tgz",
+      "integrity": "sha512-gM7GXUSd3JVRcYbBnNOtZeNnE5MCJjtZTT8QyIxJvpQ0Dh9dz3hTuEL62dOwnMFW/l47ACQ6es/8qi01P4QGZA==",
       "hasInstallScript": true,
       "dependencies": {
         "@electron/get": "^2.0.0",
@@ -9037,9 +9037,9 @@
       }
     },
     "node_modules/marked": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.2.tgz",
-      "integrity": "sha512-qoKMJqK0w6vkLk8+KnKZAH6neUZSNaQqVZ/h2yZ9S7CbLuFHyS2viB0jnqcWF9UKjwsAbMrQtnQhdmdvOVOw9w==",
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz",
+      "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==",
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -16633,9 +16633,9 @@
       }
     },
     "electron": {
-      "version": "25.9.2",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.2.tgz",
-      "integrity": "sha512-hVBN5rsrL99BKNHvzMeYy2PkAmewuIobu4U3o3EzVz4MDoLmMfW4yTH5GZ4RbJrpokoEky5IzGtRR/ggPzL6Fw==",
+      "version": "25.9.5",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.5.tgz",
+      "integrity": "sha512-gM7GXUSd3JVRcYbBnNOtZeNnE5MCJjtZTT8QyIxJvpQ0Dh9dz3hTuEL62dOwnMFW/l47ACQ6es/8qi01P4QGZA==",
       "requires": {
         "@electron/get": "^2.0.0",
         "@types/node": "^18.11.18",
@@ -20139,9 +20139,9 @@
       "requires": {}
     },
     "marked": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.2.tgz",
-      "integrity": "sha512-qoKMJqK0w6vkLk8+KnKZAH6neUZSNaQqVZ/h2yZ9S7CbLuFHyS2viB0jnqcWF9UKjwsAbMrQtnQhdmdvOVOw9w=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-9.1.6.tgz",
+      "integrity": "sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q=="
     },
     "matcher": {
       "version": "3.0.0",
diff --git a/package.json b/package.json
index 3231defafb..b3dae2e6ad 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "jimp": "0.22.10",
     "joplin-turndown-plugin-gfm": "1.0.12",
     "jsdom": "22.1.0",
-    "marked": "9.1.2",
+    "marked": "9.1.6",
     "mime-types": "2.1.35",
     "multer": "1.4.5-lts.1",
     "node-abi": "3.50.0",
@@ -101,7 +101,7 @@
   },
   "devDependencies": {
     "cross-env": "7.0.3",
-    "electron": "25.9.2",
+    "electron": "25.9.5",
     "electron-builder": "24.6.4",
     "electron-packager": "17.1.2",
     "electron-rebuild": "3.2.9",
diff --git a/src/services/search/expressions/attribute_exists.js b/src/services/search/expressions/attribute_exists.js
index df4fa938dc..6d2e92d642 100644
--- a/src/services/search/expressions/attribute_exists.js
+++ b/src/services/search/expressions/attribute_exists.js
@@ -10,6 +10,8 @@ class AttributeExistsExp extends Expression {
 
         this.attributeType = attributeType;
         this.attributeName = attributeName;
+        // template attr is used as a marker for templates, but it's not meant to be inherited
+        this.isTemplateLabel = this.attributeType === 'label' && (this.attributeName === 'template' || this.attributeName === 'workspacetemplate');
         this.prefixMatch = prefixMatch;
     }
 
@@ -23,12 +25,10 @@ class AttributeExistsExp extends Expression {
         for (const attr of attrs) {
             const note = attr.note;
 
-            if (attr.isInheritable) {
+            if (attr.isInheritable && !this.isTemplateLabel) {
                 resultNoteSet.addAll(note.getSubtreeNotesIncludingTemplated());
             }
-            else if (note.isInherited() &&
-                // template attr is used as a marker for templates, but it's not meant to be inherited
-                !(this.attributeType === 'label' && (this.attributeName === 'template' || this.attributeName === 'workspacetemplate'))) {
+            else if (note.isInherited() && !this.isTemplateLabel) {
                 resultNoteSet.addAll(note.getInheritingNotes());
             }
             else {