diff --git a/deps/db/src/logseq/db/sqlite/build.cljs b/deps/db/src/logseq/db/sqlite/build.cljs
index 22a03a0d7..98c6d1efd 100644
--- a/deps/db/src/logseq/db/sqlite/build.cljs
+++ b/deps/db/src/logseq/db/sqlite/build.cljs
@@ -156,7 +156,8 @@
                                 (let [new-block
                                       (merge (sqlite-util/build-new-property (get-ident all-idents prop-name)
                                                                              (:block/schema prop-m)
-                                                                             {:block-uuid (:block/uuid prop-m)})
+                                                                             {:block-uuid (:block/uuid prop-m)
+                                                                              :title (:block/title prop-m)})
                                              {:db/id (or (property-db-ids prop-name)
                                                          (throw (ex-info "No :db/id for property" {:property prop-name})))})
                                       pvalue-tx-m (->property-value-tx-m new-block (:build/properties prop-m) properties all-idents)]
diff --git a/src/main/frontend/db/query_dsl.cljs b/src/main/frontend/db/query_dsl.cljs
index 59ef00b37..2f3193b35 100644
--- a/src/main/frontend/db/query_dsl.cljs
+++ b/src/main/frontend/db/query_dsl.cljs
@@ -19,7 +19,6 @@
             [frontend.util.text :as text-util]
             [frontend.util :as util]
             [frontend.config :as config]
-            [logseq.db.frontend.property :as db-property]
             [frontend.state :as state]))
 
 
@@ -284,7 +283,14 @@
   [property-name]
   (if (qualified-keyword? property-name)
     property-name
-    (keyword db-property/default-user-namespace (name property-name))))
+    (or (some->> (name property-name)
+                 (db-utils/q '[:find [(pull ?b [:db/ident]) ...]
+                               :in $ ?title
+                               :where [?b :block/type "property"] [?b :block/title ?title]])
+                 first
+                 :db/ident)
+        ;; Don't return nil as that incorrectly matches all properties
+        ::no-property-found)))
 
 (defn- build-property-two-arg
   [e {:keys [db-graph?]}]
diff --git a/src/test/frontend/db/query_dsl_test.cljs b/src/test/frontend/db/query_dsl_test.cljs
index e0d0aab1b..f10248742 100644
--- a/src/test/frontend/db/query_dsl_test.cljs
+++ b/src/test/frontend/db/query_dsl_test.cljs
@@ -150,22 +150,30 @@ prop-d:: [[nada]]"}])
     (test-helper/with-config {}
       (block-property-queries-test))))
 
-
 (when js/process.env.DB_GRAPH
  (deftest db-only-block-property-queries
    (load-test-files-for-db-graph
-    [{:page {:block/title "page1"}
-      :blocks [{:block/title "b1"
-                :build/properties {:Foo "bar"}}
-               {:block/title "b2"
-                :build/properties {:foo "bar"}}]}])
+    {:properties
+       {:zzz {:block/schema {:type :default}
+              :block/title "zzz name!"}}
+       :pages-and-blocks
+       [{:page {:block/title "page1"}
+         :blocks [{:block/title "b1"
+                   :build/properties {:Foo "bar"}}
+                  {:block/title "b2"
+                   :build/properties {:foo "bar"}}
+                  {:block/title "b3"
+                   :build/properties {:zzz "bar"}}]}]})
 
    (is (= ["b1"]
           (map :block/title (dsl-query "(property Foo)")))
        "filter is case sensitive")
    (is (= ["b2"]
           (map :block/title (dsl-query "(property :user.property/foo)")))
-       "filter can handle qualified keyword properties")))
+       "filter can handle qualified keyword properties")
+   (is (= ["b3"]
+          (map :block/title (dsl-query "(property \"zzz name!\")")))
+       "filter can handle property name")))
 
 (deftest block-property-query-performance
   (let [pages (->> (repeat 10 {:tags ["tag1" "tag2"]})
diff --git a/src/test/frontend/test/helper.cljs b/src/test/frontend/test/helper.cljs
index b2a9f033c..b527836de 100644
--- a/src/test/frontend/test/helper.cljs
+++ b/src/test/frontend/test/helper.cljs
@@ -153,9 +153,12 @@
 (defn load-test-files-for-db-graph
   [options*]
   (let [;; Builds options from markdown :file/content unless given explicit build-blocks config
-        options (if (:page (first options*))
-                  {:pages-and-blocks options* :auto-create-ontology? true}
-                  (build-blocks-tx-options options*))
+        options (cond (:page (first options*))
+                      {:pages-and-blocks options* :auto-create-ontology? true}
+                      (:pages-and-blocks options*)
+                      (assoc options* :auto-create-ontology? true)
+                      :else
+                      (build-blocks-tx-options options*))
         {:keys [init-tx block-props-tx]} (sqlite-build/build-blocks-tx options)]
     (db/transact! test-db init-tx)
     (when (seq block-props-tx)