diff --git a/.gitignore b/.gitignore
index 9363c37..7d5b7a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /build
 /node_modules
-/tree-sitter
diff --git a/.gitmodules b/.gitmodules
index b8a7c84..076c5c7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
+[submodule "tree-sitter"]
+	path = tree-sitter
+	url = https://github.com/ikatyang/tree-sitter
+	branch = 0.16.7-custom
 [submodule "yaml-test-suite"]
 	path = yaml-test-suite
 	url = https://github.com/yaml/yaml-test-suite
diff --git a/docs/assets/tree-sitter-playground-0.16.7/playground.js b/docs/assets/tree-sitter-playground-0.16.7/playground.js
index 249c080..3f98e56 100644
--- a/docs/assets/tree-sitter-playground-0.16.7/playground.js
+++ b/docs/assets/tree-sitter-playground-0.16.7/playground.js
@@ -420,11 +420,19 @@ let tree;
     return COLORS_BY_INDEX[id % COLORS_BY_INDEX.length];
   }
 
+  function getLocalStorageItem(key) {
+    return localStorage.getItem(`${document.title}:${key}`);
+  }
+
+  function setLocalStorageItem(key, value) {
+    localStorage.setItem(`${document.title}:${key}`, value);
+  }
+
   function loadState() {
-    const language = localStorage.getItem("language");
-    const sourceCode = localStorage.getItem("sourceCode");
-    const query = localStorage.getItem("query");
-    const queryEnabled = localStorage.getItem("queryEnabled");
+    const language = getLocalStorageItem("language");
+    const sourceCode = getLocalStorageItem("sourceCode");
+    const query = getLocalStorageItem("query");
+    const queryEnabled = getLocalStorageItem("queryEnabled");
     if (language != null && sourceCode != null && query != null) {
       queryInput.value = query;
       codeInput.value = sourceCode;
@@ -434,14 +442,14 @@ let tree;
   }
 
   function saveState() {
-    localStorage.setItem("language", languageSelect.value);
-    localStorage.setItem("sourceCode", codeEditor.getValue());
+    setLocalStorageItem("language", languageSelect.value);
+    setLocalStorageItem("sourceCode", codeEditor.getValue());
     saveQueryState();
   }
 
   function saveQueryState() {
-    localStorage.setItem("queryEnabled", queryCheckbox.checked);
-    localStorage.setItem("query", queryEditor.getValue());
+    setLocalStorageItem("queryEnabled", queryCheckbox.checked);
+    setLocalStorageItem("query", queryEditor.getValue());
   }
 
   function debounce(func, wait, immediate) {
diff --git a/docs/index.html b/docs/index.html
index 9a45e2e..ac90cdf 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -68,11 +68,17 @@
 <script src="assets/tree-sitter-playground-0.16.7/playground.js"></script>
 
 <script>
-(codeExample => {
+((codeExample, queryExample) => {
   const handle = setInterval(() => {
     const $codeEditor = document.querySelector('.CodeMirror');
-    if ($codeEditor) {
+    const $queryEditor = document.querySelector('#query-container .CodeMirror');
+    const $queryCheckbox = document.querySelector('#query-checkbox');
+    if ($codeEditor && $queryEditor) {
       $codeEditor.CodeMirror.setValue(codeExample);
+      if (queryExample) {
+        $queryEditor.CodeMirror.setValue(queryExample);
+        if (!$queryCheckbox.checked) $queryCheckbox.click();
+      }
       clearInterval(handle);
     }
   }, 500);
@@ -104,8 +110,7 @@ total: 4443.52
 comments: >
     Late afternoon is best.
     Backup contact is Nancy
-    Billsmer @ 338-4338.
-`);
+    Billsmer @ 338-4338.`, ``);
 </script>
 
     </main>
@@ -117,9 +122,3 @@ comments: >
   src="https://code.jquery.com/jquery-3.3.1.min.js"
   crossorigin="anonymous">
 </script>
-<script>
-  let select = document.getElementById('language-select')
-  select.value = 'yaml'
-  select.dispatchEvent(new Event('change'))
-</script>
-
diff --git a/scripts/setup-tree-sitter.sh b/scripts/setup-tree-sitter.sh
index e6ee926..1299e58 100644
--- a/scripts/setup-tree-sitter.sh
+++ b/scripts/setup-tree-sitter.sh
@@ -1,4 +1,4 @@
-git clone https://github.com/ikatyang/tree-sitter --branch 0.16.7-custom --depth 1
+git submodule update --init
 cd tree-sitter
 ./script/build-wasm
 cargo build --release
diff --git a/tree-sitter b/tree-sitter
new file mode 160000
index 0000000..1ccb0ac
--- /dev/null
+++ b/tree-sitter
@@ -0,0 +1 @@
+Subproject commit 1ccb0ac0e840c58f23012dd495bd0180884077e1