diff --git a/deps/common/package.json b/deps/common/package.json
index 06356b752..a09f1b496 100644
--- a/deps/common/package.json
+++ b/deps/common/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v13"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v14"
   },
   "scripts": {
     "test": "yarn nbb-logseq -cp test -m nextjournal.test-runner"
diff --git a/deps/common/yarn.lock b/deps/common/yarn.lock
index b2a2dc862..0488c2748 100644
--- a/deps/common/yarn.lock
+++ b/deps/common/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v13":
-  version "1.2.173-feat-db-v12"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/8274d8b40b7fec84532c54e16b5a8c6f78bf673b"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v14":
+  version "1.2.173-feat-db-v14"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/675a60baadd6e76829d30fbaaca89917c51cf0a9"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/db/package.json b/deps/db/package.json
index e192c9ed3..1444aaf25 100644
--- a/deps/db/package.json
+++ b/deps/db/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v13"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v14"
   },
   "dependencies": {
     "better-sqlite3": "9.3.0"
diff --git a/deps/db/test/logseq/db/frontend/inputs_test.cljs b/deps/db/test/logseq/db/frontend/inputs_test.cljs
index 2a8e6b32b..5dce91008 100644
--- a/deps/db/test/logseq/db/frontend/inputs_test.cljs
+++ b/deps/db/test/logseq/db/frontend/inputs_test.cljs
@@ -59,24 +59,27 @@
                                  :input-options {:current-block-uuid block-uuid}}))))
         ":current-block input resolves to current block's :db/id")
 
-    (is (= []
-           (map :block/content
-                (custom-query @conn
-                              {:inputs [:current-block]
-                               :query '[:find (pull ?b [*])
-                                        :in $ ?current-block
-                                        :where [?b :block/parent ?current-block]]})))
-        ":current-block input doesn't resolve when :current-block-uuid is not provided")
+    (is (thrown-with-msg?
+         js/Error
+         #"Nothing found for entity"
+         (custom-query @conn
+                       {:inputs [:current-block]
+                        :query '[:find (pull ?b [*])
+                                 :in $ ?current-block
+                                 :where [?b :block/parent ?current-block]]
+                        :input-options {:current-block-uuid nil}}))
+        ":current-block input doesn't resolve and fails when :current-block-uuid is not provided")
 
-    (is (= []
-           (map :block/content
-                (custom-query @conn
-                              {:inputs [:current-block]
-                               :query '[:find (pull ?b [*])
-                                        :in $ ?current-block
-                                        :where [?b :block/parent ?current-block]]
-                               :input-options {:current-block-uuid :magic}})))
-        ":current-block input doesn't resolve when current-block-uuid is invalid")
+    (is (thrown-with-msg?
+         js/Error
+         #"Nothing found for entity"
+         (custom-query @conn
+                       {:inputs [:current-block]
+                        :query '[:find (pull ?b [*])
+                                 :in $ ?current-block
+                                 :where [?b :block/parent ?current-block]]
+                        :input-options {:current-block-uuid :magic}}))
+        ":current-block input doesn't resolve and fails when :current-block-uuid is invalid")
 
     (is (= ["parent"]
            (let [block-uuid (-> (d/q '[:find (pull ?b [:block/uuid])
diff --git a/deps/db/test/logseq/db/frontend/rules_test.cljs b/deps/db/test/logseq/db/frontend/rules_test.cljs
index 83fac5241..25c2487ef 100644
--- a/deps/db/test/logseq/db/frontend/rules_test.cljs
+++ b/deps/db/test/logseq/db/frontend/rules_test.cljs
@@ -102,7 +102,7 @@
             "page-property returns result when page has property")
         (is (= []
                (->> (q-with-rules '[:find (pull ?b [:block/original-name])
-                                    :where (page-property ?b :user.property/page-many ?pv) [?pv :block/original-name "Page B"]]
+                                    :where [?b :user.property/page-many ?pv] [?pv :block/original-name "Page B"]]
                                   @conn)
                     (map (comp :block/original-name first))))
             "page-property returns no result when page doesn't have property value"))
diff --git a/deps/db/yarn.lock b/deps/db/yarn.lock
index 71786f15d..e2248359d 100644
--- a/deps/db/yarn.lock
+++ b/deps/db/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v13":
-  version "1.2.173-feat-db-v12"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/8274d8b40b7fec84532c54e16b5a8c6f78bf673b"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v14":
+  version "1.2.173-feat-db-v14"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/675a60baadd6e76829d30fbaaca89917c51cf0a9"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/graph-parser/package.json b/deps/graph-parser/package.json
index bbc6e3a8d..97780b5c4 100644
--- a/deps/graph-parser/package.json
+++ b/deps/graph-parser/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v13",
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v14",
     "better-sqlite3": "9.3.0"
   },
   "dependencies": {
diff --git a/deps/graph-parser/yarn.lock b/deps/graph-parser/yarn.lock
index 0463a866e..96814e785 100644
--- a/deps/graph-parser/yarn.lock
+++ b/deps/graph-parser/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v13":
-  version "1.2.173-feat-db-v12"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/8274d8b40b7fec84532c54e16b5a8c6f78bf673b"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v14":
+  version "1.2.173-feat-db-v14"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/675a60baadd6e76829d30fbaaca89917c51cf0a9"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/outliner/package.json b/deps/outliner/package.json
index e42d1e0be..f0a1e61cf 100644
--- a/deps/outliner/package.json
+++ b/deps/outliner/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v13"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v14"
   },
   "dependencies": {
     "better-sqlite3": "9.3.0",
diff --git a/deps/outliner/yarn.lock b/deps/outliner/yarn.lock
index a05a638f9..35a4522a8 100644
--- a/deps/outliner/yarn.lock
+++ b/deps/outliner/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v13":
-  version "1.2.173-feat-db-v12"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/8274d8b40b7fec84532c54e16b5a8c6f78bf673b"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v14":
+  version "1.2.173-feat-db-v14"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/675a60baadd6e76829d30fbaaca89917c51cf0a9"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/deps/publishing/package.json b/deps/publishing/package.json
index d71073442..d3214ca25 100644
--- a/deps/publishing/package.json
+++ b/deps/publishing/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v13",
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v14",
     "mldoc": "^1.5.8"
   },
   "dependencies": {
diff --git a/deps/publishing/yarn.lock b/deps/publishing/yarn.lock
index f258dcbee..8da3b0271 100644
--- a/deps/publishing/yarn.lock
+++ b/deps/publishing/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v13":
-  version "1.2.173-feat-db-v12"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/8274d8b40b7fec84532c54e16b5a8c6f78bf673b"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v14":
+  version "1.2.173-feat-db-v14"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/675a60baadd6e76829d30fbaaca89917c51cf0a9"
   dependencies:
     import-meta-resolve "^2.1.0"
 
diff --git a/scripts/package.json b/scripts/package.json
index 7488f0c1f..b23cad58a 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v13"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v14"
   },
   "dependencies": {
     "better-sqlite3": "9.3.0",
diff --git a/scripts/yarn.lock b/scripts/yarn.lock
index 6d5e45b7c..a291fa75f 100644
--- a/scripts/yarn.lock
+++ b/scripts/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v13":
-  version "1.2.173-feat-db-v12"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/8274d8b40b7fec84532c54e16b5a8c6f78bf673b"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v14":
+  version "1.2.173-feat-db-v14"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/675a60baadd6e76829d30fbaaca89917c51cf0a9"
   dependencies:
     import-meta-resolve "^2.1.0"