diff --git a/src/main/frontend/worker/search.cljs b/src/main/frontend/worker/search.cljs
index ff67d79ed..ebd6a7a47 100644
--- a/src/main/frontend/worker/search.cljs
+++ b/src/main/frontend/worker/search.cljs
@@ -202,15 +202,16 @@
   (->> properties
        (map
         (fn [[k v]]
-          (let [values
+          (let [property (d/entity db k)
+                values
                 (->> (if (set? v) v #{v})
                      (map (fn [val]
-                            (if (uuid? val)
-                              (let [e (d/entity db [:block/uuid val])
+                            (if (= :db.type/ref (:db/valueType property))
+                              (let [e (d/entity db (:db/id val))
                                     value (or
                                            ;; closed value
                                            (property-value-when-closed e)
-                                           ;; page
+                                           ;; :page or :date properties
                                            (:block/original-name e)
                                            ;; block generated by template
                                            (and
@@ -223,7 +224,7 @@
                               val)))
                      (remove string/blank?))]
             (when (seq values)
-              (str (:block/original-name (d/entity db [:block/uuid k]))
+              (str (:block/original-name property)
                    ": "
                    (string/join "; " values))))))
        (remove nil?)