diff --git a/.github/workflows/graph-parser.yml b/.github/workflows/graph-parser.yml
index dc280f2dd..98d0e7c3a 100644
--- a/.github/workflows/graph-parser.yml
+++ b/.github/workflows/graph-parser.yml
@@ -83,7 +83,7 @@ jobs:
         run: clojure -M:test
 
       - name: Run nbb-logseq tests
-        run: yarn nbb-logseq -cp src:test:../db/src -m logseq.graph-parser.nbb-test-runner/run-tests
+        run: yarn test
 
       # In this job because it depends on an npm package
       - name: Load namespaces into nbb-logseq
diff --git a/deps/graph-parser/.carve/ignore b/deps/graph-parser/.carve/ignore
index 3548657b6..21c1be558 100644
--- a/deps/graph-parser/.carve/ignore
+++ b/deps/graph-parser/.carve/ignore
@@ -2,3 +2,5 @@
 logseq.graph-parser.cli/parse-graph
 ;; For CLI
 logseq.graph-parser.mldoc/ast-export-markdown
+;; API
+logseq.graph-parser.property/register-built-in-properties
diff --git a/deps/graph-parser/README.md b/deps/graph-parser/README.md
index 96f34f1ad..8a0a5efb0 100644
--- a/deps/graph-parser/README.md
+++ b/deps/graph-parser/README.md
@@ -49,7 +49,7 @@ To see available options that can run specific tests or namespaces: `clojure -M:
 
 To run nbb-logseq tests:
 ```
-yarn nbb-logseq -cp src:test -m logseq.graph-parser.nbb-test-runner/run-tests
+yarn test
 ```
 
 ### Managing dependencies
diff --git a/deps/graph-parser/package.json b/deps/graph-parser/package.json
index 9148a3274..bd6d48823 100644
--- a/deps/graph-parser/package.json
+++ b/deps/graph-parser/package.json
@@ -7,5 +7,8 @@
   },
   "dependencies": {
     "mldoc": "^1.3.9"
+  },
+  "scripts": {
+    "test": "nbb-logseq -cp src:test:../db/src -m logseq.graph-parser.nbb-test-runner/run-tests"
   }
 }
diff --git a/deps/graph-parser/src/logseq/graph_parser/property.cljs b/deps/graph-parser/src/logseq/graph_parser/property.cljs
index 1008412c7..29de7d02b 100644
--- a/deps/graph-parser/src/logseq/graph_parser/property.cljs
+++ b/deps/graph-parser/src/logseq/graph_parser/property.cljs
@@ -26,8 +26,10 @@
   "Properties that should only be used by logseq"
   []
   (set/union
-   #{:id :custom-id :background-color :heading :collapsed :created-at :updated-at :last-modified-at :created_at :last_modified_at :query-table :query-properties :query-sort-by :query-sort-desc
-     :ls-type :hl-type :hl-page :hl-stamp}
+   #{:id :custom-id :background-color :heading :collapsed :created-at :updated-at
+     :last-modified-at :created_at :last_modified_at :query-table
+     :query-properties :query-sort-by :query-sort-desc :ls-type :hl-type
+     :hl-page :hl-stamp :template-including-parent :icon :filters}
    (set (map keyword markers))
    @built-in-extended-properties))
 
diff --git a/deps/graph-parser/src/logseq/graph_parser/test/docs_graph_helper.cljs b/deps/graph-parser/src/logseq/graph_parser/test/docs_graph_helper.cljs
index 7e3256455..c76c34cc9 100644
--- a/deps/graph-parser/src/logseq/graph_parser/test/docs_graph_helper.cljs
+++ b/deps/graph-parser/src/logseq/graph_parser/test/docs_graph_helper.cljs
@@ -142,7 +142,7 @@
   ;; only increase over time as the docs graph rarely has deletions
   (testing "Counts"
     (is (= 211 (count files)) "Correct file count")
-    (is (= 42648 (count (d/datoms db :eavt))) "Correct datoms count")
+    (is (= 42638 (count (d/datoms db :eavt))) "Correct datoms count")
 
     (is (= 3600
            (ffirst