diff --git a/src/main/frontend/handler/extract.cljs b/src/main/frontend/handler/extract.cljs
index 92bae5feb..606c06165 100644
--- a/src/main/frontend/handler/extract.cljs
+++ b/src/main/frontend/handler/extract.cljs
@@ -115,7 +115,7 @@
                                                              (remove string/blank?))]
                                                (swap! ref-tags set/union (set tags))
                                                (map (fn [tag] {:block/name (string/lower-case tag)
-                                                               :block/original-name tag})
+                                                              :block/original-name tag})
                                                  tags)))))
           pages (->> (concat
                       [page-entity]
@@ -153,7 +153,9 @@
            properties (let [properties (and (property/properties-ast? first-block)
                                             (->> (last first-block)
                                                  (map (fn [[x y]]
-                                                        [x (property/parse-property x y)]))
+                                                        [x (if (string? y)
+                                                             (property/parse-property x y)
+                                                             y)]))
                                                  (into {})
                                                  (walk/keywordize-keys)))]
                         (when (and properties (seq properties))