diff --git a/README.md b/README.md
index 3218c74..1a09421 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ npm install git+https://github.com/nextapps-de/flexsearch/tree/v0.8-preview
 
 - Persistent indexes support for: `IndexedDB` (Browser), `Redis`, `SQLite`, `Postgres`, `MongoDB`, `Clickhouse`
 - Enhanced language customization via the new `Encoder` class
+- Result Highlighting
 - Query performance achieve results up to 4.5 times faster compared to the previous generation v0.7.x by also improving the quality of results
 - Enhanced support for larger indexes or larger result sets
 - Improved offset and limit processing achieve up to 100 times faster traversal performance through large datasets
diff --git a/example/browser-legacy/basic-persistent/index.html b/example/browser-legacy/basic-persistent/index.html
index ffe4c79..07cf6e0 100644
--- a/example/browser-legacy/basic-persistent/index.html
+++ b/example/browser-legacy/basic-persistent/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-persistent</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/basic-resolver/index.html b/example/browser-legacy/basic-resolver/index.html
index a13a833..c4ad6a2 100644
--- a/example/browser-legacy/basic-resolver/index.html
+++ b/example/browser-legacy/basic-resolver/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-resolver</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.min.js"></script>
 <script>
 
   // create a simple index which can store id-content-pairs
diff --git a/example/browser-legacy/basic-suggestion/index.html b/example/browser-legacy/basic-suggestion/index.html
index 310d986..52f2522 100644
--- a/example/browser-legacy/basic-suggestion/index.html
+++ b/example/browser-legacy/basic-suggestion/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-suggestion</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.light.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.light.min.js"></script>
 <script>
 
   // create a simple index which can store id-content-pairs
diff --git a/example/browser-legacy/basic-worker/index.html b/example/browser-legacy/basic-worker/index.html
index 1e63a93..6179323 100644
--- a/example/browser-legacy/basic-worker/index.html
+++ b/example/browser-legacy/basic-worker/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-worker</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/basic/index.html b/example/browser-legacy/basic/index.html
index 5e5b64d..f2b5883 100644
--- a/example/browser-legacy/basic/index.html
+++ b/example/browser-legacy/basic/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.light.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.light.min.js"></script>
 <script>
 
   // create a simple index which can store id-content-pairs
diff --git a/example/browser-legacy/document-highlighting/index.html b/example/browser-legacy/document-highlighting/index.html
index c0c4418..8f859b1 100644
--- a/example/browser-legacy/document-highlighting/index.html
+++ b/example/browser-legacy/document-highlighting/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document-highlighting</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.compact.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.compact.min.js"></script>
 <script type="module">
 
   // some test data
@@ -21,7 +21,6 @@
   // create the document index
   const index = new FlexSearch.Document({
     document: {
-      id: "tconst",
       store: true,
       index: [{
         field: "title",
@@ -48,8 +47,8 @@
   });
 
   // display results
-  console.log(suggestions);
-  log(JSON.stringify(suggestions, null, 2));
+  console.log(result);
+  log(JSON.stringify(result, null, 2));
 
   function log(str){
     document.body.appendChild(
diff --git a/example/browser-legacy/document-persistent/index.html b/example/browser-legacy/document-persistent/index.html
index 2b87190..11c7b2a 100644
--- a/example/browser-legacy/document-persistent/index.html
+++ b/example/browser-legacy/document-persistent/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document-persistent</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/document-worker/index.html b/example/browser-legacy/document-worker/index.html
index 47f90a3..0474ca7 100644
--- a/example/browser-legacy/document-worker/index.html
+++ b/example/browser-legacy/document-worker/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document-worker</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/document/index.html b/example/browser-legacy/document/index.html
index 4798671..a663897 100644
--- a/example/browser-legacy/document/index.html
+++ b/example/browser-legacy/document/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.compact.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.compact.min.js"></script>
 <script>
 
   // some test data
diff --git a/example/browser-legacy/language-pack/index.html b/example/browser-legacy/language-pack/index.html
index 5f27e4e..17a85c7 100644
--- a/example/browser-legacy/language-pack/index.html
+++ b/example/browser-legacy/language-pack/index.html
@@ -6,9 +6,9 @@
   <title>Example: browser-legacy-language-packs</title>
 </head>
 <body style="white-space: pre">
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.compact.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.compact.min.js"></script>
 <!-- Load language pack after loading the library -->
-<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/lang/en.min.js"></script>
+<script src="https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/lang/en.min.js"></script>
 <script>
 
   const encoder = new FlexSearch.Encoder(
diff --git a/example/browser-module/basic-persistent/index.html b/example/browser-module/basic-persistent/index.html
index a480088..8dc8bdf 100644
--- a/example/browser-module/basic-persistent/index.html
+++ b/example/browser-module/basic-persistent/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index, IndexedDB } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.module.min.js";
+  import { Index, IndexedDB } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.module.min.js";
 
   // create DB instance with namespace
   const db = new IndexedDB("my-store");
diff --git a/example/browser-module/basic-resolver/index.html b/example/browser-module/basic-resolver/index.html
index a30c588..a2881e5 100644
--- a/example/browser-module/basic-resolver/index.html
+++ b/example/browser-module/basic-resolver/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index, Resolver } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.module.min.js";
+  import { Index, Resolver } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.module.min.js";
 
   // create a simple index which can store id-content-pairs
   const index = new Index({
diff --git a/example/browser-module/basic-suggestion/index.html b/example/browser-module/basic-suggestion/index.html
index 7086142..5bb4563 100644
--- a/example/browser-module/basic-suggestion/index.html
+++ b/example/browser-module/basic-suggestion/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.light.module.min.js";
+  import { Index } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.light.module.min.js";
 
   // create a simple index which can store id-content-pairs
   const index = new Index({
diff --git a/example/browser-module/basic-worker-extern-config/config.js b/example/browser-module/basic-worker-extern-config/config.js
index 941f73c..c6410b7 100644
--- a/example/browser-module/basic-worker-extern-config/config.js
+++ b/example/browser-module/basic-worker-extern-config/config.js
@@ -1,4 +1,4 @@
-import { Encoder } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.module.min.js";
+import { Encoder } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.module.min.js";
 
 export default {
     tokenize: "forward",
diff --git a/example/browser-module/basic/index.html b/example/browser-module/basic/index.html
index 0989ef4..fb069fb 100644
--- a/example/browser-module/basic/index.html
+++ b/example/browser-module/basic/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.light.module.min.js";
+  import { Index } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.light.module.min.js";
 
   // create a simple index which can store id-content-pairs
   const index = new Index({
diff --git a/example/browser-module/document-highlighting/index.html b/example/browser-module/document-highlighting/index.html
index f430586..0ec5692 100644
--- a/example/browser-module/document-highlighting/index.html
+++ b/example/browser-module/document-highlighting/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Document, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.compact.module.min.js";
+  import { Document, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.compact.module.min.js";
 
   // some test data
   const data = [{
@@ -22,7 +22,6 @@
   // create the document index
   const index = new Document({
     document: {
-      id: "tconst",
       store: true,
       index: [{
         field: "title",
@@ -49,8 +48,8 @@
   });
 
   // display results
-  console.log(suggestions);
-  log(JSON.stringify(suggestions, null, 2));
+  console.log(result);
+  log(JSON.stringify(result, null, 2));
 
   function log(str){
     document.body.appendChild(
diff --git a/example/browser-module/document-persistent/index.html b/example/browser-module/document-persistent/index.html
index b8e1ad8..37adea0 100644
--- a/example/browser-module/document-persistent/index.html
+++ b/example/browser-module/document-persistent/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Document, Charset, IndexedDB } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.module.min.js";
+  import { Document, Charset, IndexedDB } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.module.min.js";
 
   // some test data
   const data = [{
diff --git a/example/browser-module/document-worker-extern-config/config.originalTitle.js b/example/browser-module/document-worker-extern-config/config.originalTitle.js
index a1feefd..bdd4c74 100644
--- a/example/browser-module/document-worker-extern-config/config.originalTitle.js
+++ b/example/browser-module/document-worker-extern-config/config.originalTitle.js
@@ -1,5 +1,5 @@
-import { Encoder, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.module.min.js";
-import EnglishPreset from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/module/lang/en.js";
+import { Encoder, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.module.min.js";
+import EnglishPreset from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/module/lang/en.js";
 
 export default {
     tokenize: "forward",
diff --git a/example/browser-module/document-worker-extern-config/config.primaryTitle.js b/example/browser-module/document-worker-extern-config/config.primaryTitle.js
index a1feefd..bdd4c74 100644
--- a/example/browser-module/document-worker-extern-config/config.primaryTitle.js
+++ b/example/browser-module/document-worker-extern-config/config.primaryTitle.js
@@ -1,5 +1,5 @@
-import { Encoder, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.bundle.module.min.js";
-import EnglishPreset from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/module/lang/en.js";
+import { Encoder, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.bundle.module.min.js";
+import EnglishPreset from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/module/lang/en.js";
 
 export default {
     tokenize: "forward",
diff --git a/example/browser-module/document/index.html b/example/browser-module/document/index.html
index 58e999b..a463436 100644
--- a/example/browser-module/document/index.html
+++ b/example/browser-module/document/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Document, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.compact.module.min.js";
+  import { Document, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.compact.module.min.js";
 
   // some test data
   const data = [{
diff --git a/example/browser-module/language-pack/index.html b/example/browser-module/language-pack/index.html
index 3e070a8..240245b 100644
--- a/example/browser-module/language-pack/index.html
+++ b/example/browser-module/language-pack/index.html
@@ -8,8 +8,8 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index, Encoder, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/flexsearch.compact.module.min.js";
-  import EnglishPreset from "https://rawcdn.githack.com/nextapps-de/flexsearch/aff94f2b1d830e21463b237070f7e6f7eb556b82/dist/module/lang/en.js";
+  import { Index, Encoder, Charset } from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/flexsearch.compact.module.min.js";
+  import EnglishPreset from "https://rawcdn.githack.com/nextapps-de/flexsearch/9e1b24a124c3d0065b4ddf5cea9d109aca2fb7d2/dist/module/lang/en.js";
 
   const encoder = new Encoder(
     Charset.LatinSimple,
