diff --git a/deps/graph-parser/src/logseq/graph_parser/block.cljs b/deps/graph-parser/src/logseq/graph_parser/block.cljs
index db9cbc601..9b18cdfbc 100644
--- a/deps/graph-parser/src/logseq/graph_parser/block.cljs
+++ b/deps/graph-parser/src/logseq/graph_parser/block.cljs
@@ -294,9 +294,10 @@
        {:block/name page-name
         :block/original-name original-page-name}
        (when with-id?
-         (let [new-uuid (cond page-entity      (:block/uuid page-entity)
-                              (uuid? with-id?) with-id?
-                              :else            (d/squuid))]
+         (let [new-uuid (or
+                         (cond page-entity      (:block/uuid page-entity)
+                               (uuid? with-id?) with-id?)
+                         (d/squuid))]
            {:block/uuid new-uuid}))
        (when namespace?
          (let [namespace (first (gp-util/split-last "/" original-page-name))]
diff --git a/deps/graph-parser/src/logseq/graph_parser/util.cljs b/deps/graph-parser/src/logseq/graph_parser/util.cljs
index 0c21ac65d..1c66c5fa9 100644
--- a/deps/graph-parser/src/logseq/graph_parser/util.cljs
+++ b/deps/graph-parser/src/logseq/graph_parser/util.cljs
@@ -116,13 +116,15 @@
 (defn split-namespace-pages
   [title]
   (let [parts (string/split title "/")]
-    (loop [others (rest parts)
-           result [(first parts)]]
-      (if (seq others)
-        (let [prev (last result)]
-          (recur (rest others)
-                 (conj result (str prev "/" (first others)))))
-        result))))
+    (->>
+     (loop [others (rest parts)
+            result [(first parts)]]
+       (if (seq others)
+         (let [prev (last result)]
+           (recur (rest others)
+                  (conj result (str prev "/" (first others)))))
+         result))
+     (map string/trim))))
 
 (defn decode-namespace-underlines
   "Decode namespace underlines to slashed;
diff --git a/src/main/frontend/handler/import.cljs b/src/main/frontend/handler/import.cljs
index 792a23315..5f293819e 100644
--- a/src/main/frontend/handler/import.cljs
+++ b/src/main/frontend/handler/import.cljs
@@ -122,7 +122,8 @@
    :properties - map
    "
   [{:keys [type uuid title children properties] :as tree}]
-  (let [has-children? (seq children)
+  (let [title (string/trim title)
+        has-children? (seq children)
         page-format (or (some-> tree (:children) (first) (:format)) :markdown)
         whiteboard? (= type "whiteboard")]
     (try (page-handler/create! title {:redirect?           false
diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs
index 81e09189b..9b3434f1d 100644
--- a/src/main/frontend/handler/page.cljs
+++ b/src/main/frontend/handler/page.cljs
@@ -158,7 +158,7 @@
                              ;; only apply uuid to the deepest hierarchy of page to create if provided.
                              (-> (block/page-name->map page (if (= page title) with-uuid? true))
                                  (assoc :block/format format)))
-                           pages)
+                        pages)
              txs      (->> pages
                            ;; for namespace pages, only last page need properties
                            drop-last