diff --git a/src/main/frontend/components/cmdk/core.cljs b/src/main/frontend/components/cmdk/core.cljs
index 64a926f933..afa203ba03 100644
--- a/src/main/frontend/components/cmdk/core.cljs
+++ b/src/main/frontend/components/cmdk/core.cljs
@@ -352,11 +352,12 @@
     (swap! !results update group merge {:status :success :items matched-items})))
 
 (defmethod load-results :current-page [group state]
-  (if-let [current-page (page-util/get-current-page-id)]
+  (if-let [current-page (when-let [id (page-util/get-current-page-id)]
+                          (db/entity id))]
     (let [!results (::results state)
           !input (::input state)
           repo (state/get-current-repo)
-          opts {:limit 100 :page current-page}]
+          opts {:limit 100 :page (str (:block/uuid current-page))}]
       (swap! !results assoc-in [group :status] :loading)
       (swap! !results assoc-in [:current-page :status] :loading)
       (p/let [blocks (search/block-search repo @!input opts)
@@ -367,7 +368,7 @@
                                       (uuid (:block/uuid block)))]
                              {:icon "block"
                               :icon-theme :gray
-                              :text (:block/content block)
+                              :text (highlight-content-query (:block/content block) @!input)
                               :header (block/breadcrumb {:search? true} repo id {})
                               :current-page? true
                               :source-block block})) blocks)]
diff --git a/src/main/frontend/worker/search.cljs b/src/main/frontend/worker/search.cljs
index 179f91a214..5f8d99e3bd 100644
--- a/src/main/frontend/worker/search.cljs
+++ b/src/main/frontend/worker/search.cljs
@@ -115,7 +115,7 @@
   (try
     (p/let [result (if page
                      (.exec db #js {:sql sql
-                                    :bind #js [input page limit]
+                                    :bind #js [page input limit]
                                     :rowMode "array"})
                      (.exec db #js {:sql sql
                                     :bind #js [input limit]