diff --git a/README.md b/README.md
index 804da36..3915817 100644
--- a/README.md
+++ b/README.md
@@ -1537,13 +1537,12 @@ index.cleanup();
 
 > The `cleanup` method has no effect when not using `fastupdate: true`.
 
-
 ## Context Search
 
 The basic idea of this concept is to limit relevance by its context instead of calculating relevance through the whole distance of its corresponding document. The context acts like a bidirectional moving window of 2 pointers (terms) which can initially have a maximum distance of the value passed via option setting `depth` and dynamically growth on search when the query did not match any results.
 
 <p align="center">
-    <img src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@master/doc/contextual-index.svg?v=4" width="100%">
+    <img src="doc/context-index.svg" width="100%">
 </p>
 
 ### Enable Context-Search
@@ -1574,7 +1573,7 @@ var index = new FlexSearch({
 
 ### Compare Context Search
 
-Pay attention of the numbers "1", "2" and "3":
+Pay attention to the numbers "1", "2" and "3":
 
 ```js
 const index = new Index();
diff --git a/demo/autocomplete.html b/demo/autocomplete.html
index c9ebcf7..66ee1a3 100644
--- a/demo/autocomplete.html
+++ b/demo/autocomplete.html
@@ -1,29 +1,31 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1, maximum-scale=1.0, user-scalable=no">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1, maximum-scale=1.0, user-scalable=no, viewport-fit=cover, shrink-to-fit=no, minimal-ui">
     <title>Demo: Auto-Complete</title>
     <style>
         body{
-            padding:0;
-            margin:0 10px;
+            padding: 0;
+            margin: 0 10px;
+            font-family: Helvetica, Arial, sans-serif;
+            font-size: 14px;
         }
-        table{
-            width: 300px;
-            table-layout: fixed;
+        #header{
             position: fixed;
-            top: 0;
-            padding-top: 10px;
+            top: 10px;
+            left: 10px;
+            width: 100%;
+            display: flex;
+            justify-content: flex-start;
+            flex-direction: row;
+            max-width: 500px;
+            table-layout: fixed;
             background-color: #fff;
             z-index: 1;
         }
-        td, tr{
-            width: 300px;
-            border: none;
-        }
-        input{
-            width: 300px;
+        input[type="text"]{
+            width: 100%;
             border: 1px solid #ddd;
             border-radius: 4px;
             outline: none;
@@ -34,6 +36,11 @@
         #autocomplete{
             color: #999;
             background-color: #f5f5f5;
+            pointer-events: none;
+        }
+        #trigger-prev,
+        #trigger-next{
+            pointer-events: none
         }
         input{
             padding:7px 5px;
@@ -54,31 +61,55 @@
         #suggestions b{
             color: blue;
         }
+        #suggestions:empty:before{
+            content: "No resuls found";
+            font-size: 12px;
+            color: #999;
+            margin-left: 7px;
+        }
+        #info{
+            position: absolute;
+            bottom: 7px;
+            left: 12px;
+            color: #888;
+        }
+        label{
+            width: 100px;
+            height: 32px;
+            display: flex;
+            align-items: center;
+            margin: 0 10px;
+        }
         @media only screen and (max-width: 600px) {
-            table,
-            td,
-            tr,
-            input{
-                width: 98%;
+            body{
+                font-size: 12px;
+            }
+            input[type="text"]{
+                /*width: 98%;*/
             }
         }
     </style>
 </head>
 <body>
-<span style="color: #000; float: right">(iterate through result by arrow keys)</span>
-<table>
-    <tr>
-        <td style="position: relative">
-            <input type="text" id="autocomplete">
-            <input type="text" id="userinput" autocorrect="off" spellcheck="false" autocomplete="off" placeholder="Search by movie title ...">
-        </td>
-    </tr>
-</table>
+<div id="header">
+    <div style="position: relative; width: 100%;">
+        <input type="text" id="trigger-prev">
+        <input type="text" id="autocomplete" disabled>
+        <input type="text" id="userinput" placeholder="Search by movie title ..." autocorrect="off" spellcheck="false" autocomplete="off" autofocus>
+        <input type="text" id="trigger-next">
+    </div>
+    <label>
+        <input type="checkbox" id="suggest" checked> Suggest
+    </label>
+</div>
 <div id="suggestions"></div>
+<!--<div id="info">iterate results by arrow keys</div>-->
 <script type="module">
 
-    import { Document, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js";
-    import data from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/demo/data/movies.js";
+    //import { Document, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@master/dist/flexsearch.bundle.module.min.js";
+    import { Document, Charset } from "../src/bundle.js";
+    //import EnglishPreset from "../src/lang/en.js";
+    import data from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@master/demo/data/movies.js";
 
     // for "Result Highlighting" it requires the usage of a Document Index
     // also when just adding id-content-pairs to a single index
@@ -91,7 +122,6 @@
             store: true,
             index: [{
                 field: "title",
-                charset: Charset.LatinSimple,
                 // a forward tokenizer is minimum
                 // required by an instant search
                 tokenize: "forward"
@@ -103,28 +133,52 @@
         // pass a flat pseudo document when using
         // result highlighting on plain string inputs
         index.add(i, {
-            title: data[i]
+            "title": data[i]
         });
     }
 
     const suggestions = document.getElementById("suggestions");
     const autocomplete = document.getElementById("autocomplete");
     const userinput = document.getElementById("userinput");
+    const suggest = document.getElementById("suggest");
+    const trigger_prev = document.getElementById("trigger-prev");
+    const trigger_next = document.getElementById("trigger-next");
     let results;
     let iterate = 0;
 
     userinput.addEventListener("input", show_results, true);
     userinput.addEventListener("keyup", accept_autocomplete, true);
     userinput.addEventListener("keydown", iterate_autocomplete, true);
+    suggest.addEventListener("change", toggle_suggest, true);
     suggestions.addEventListener("click", accept_suggestion, true);
 
+    trigger_prev.addEventListener("focus", function(){
+        if(iterate > 0) {
+            iterate_autocomplete({ key: "ArrowUp"});
+        }
+        userinput.focus();
+    }, true);
+    trigger_next.addEventListener("focus", function(){
+        if(iterate < results.length){
+            iterate_autocomplete({ key: "ArrowDown"});
+        }
+        userinput.focus();
+    }, true);
+
+    function toggle_suggest(){
+        // changing any of the search options requires
+        // deletion of cached results (when using cache)
+        index.cache.clear();
+        show_results();
+    }
+
     function show_results(){
 
-        let value = this.value;
-        results = index.search({
+        let value = userinput.value;
+        results = index.searchCache({
             query: value,
             limit: 25,
-            suggest: true,
+            suggest: suggest.checked,
             enrich: true,
             highlight: "<b>$1</b>"
         });
@@ -165,12 +219,14 @@
                 if(iterate > 0){
                     iterate--;
                 }
+                event.preventDefault &&
                 event.preventDefault();
             }
             else if(key === "ArrowDown"){
                 if(iterate < results.length){
                     iterate++;
                 }
+                event.preventDefault &&
                 event.preventDefault();
             }
         }
diff --git a/dist/flexsearch.bundle.debug.js b/dist/flexsearch.bundle.debug.js
index 1c2c179..9387620 100644
--- a/dist/flexsearch.bundle.debug.js
+++ b/dist/flexsearch.bundle.debug.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle/Debug)
+ * FlexSearch.js v0.8.154 (Bundle/Debug)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -1768,21 +1768,21 @@ v.import = function(a, c) {
 };
 la(U.prototype);
 function Va(a, c, b) {
-  a = ("object" === typeof a ? "" + a.query : a).toLowerCase();
+  const e = ("object" === typeof a ? "" + a.query : a).toLowerCase();
   this.cache || (this.cache = new X());
-  let e = this.cache.get(a);
-  if (!e) {
-    e = this.search(a, c, b);
-    if (e.then) {
-      const d = this;
-      e.then(function(f) {
-        d.cache.set(a, f);
-        return f;
+  let d = this.cache.get(e);
+  if (!d) {
+    d = this.search(a, c, b);
+    if (d.then) {
+      const f = this;
+      d.then(function(g) {
+        f.cache.set(e, g);
+        return g;
       });
     }
-    this.cache.set(a, e);
+    this.cache.set(e, d);
   }
-  return e;
+  return d;
 }
 function X(a) {
   this.limit = a && !0 !== a ? a : 1000;
diff --git a/dist/flexsearch.bundle.min.js b/dist/flexsearch.bundle.min.js
index c3782e1..bf55d96 100644
--- a/dist/flexsearch.bundle.min.js
+++ b/dist/flexsearch.bundle.min.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle)
+ * FlexSearch.js v0.8.154 (Bundle)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -63,7 +63,7 @@ u.clear=function(){const a=[];for(const b of this.index.values()){const c=b.clea
 u.get=function(a){return this.db?this.index.get(this.field[0]).db.enrich(a).then(function(b){return b[0]&&b[0].doc||null}):this.store.get(a)||null};u.set=function(a,b){"object"===typeof a&&(b=a,a=I(b,this.key));this.store.set(a,b);return this};u.searchCache=Va;
 u.export=function(a,b,c=0,e=0){if(c<this.field.length){const g=this.field[c];if((b=this.index.get(g).export(a,g,c,e=1))&&b.then){const k=this;return b.then(function(){return k.export(a,g,c+1)})}return this.export(a,g,c+1)}let d,f;switch(e){case 0:d="reg";f=wa(this.reg);b=null;break;case 1:d="tag";f=this.tag&&ua(this.tag,this.reg.size);b=null;break;case 2:d="doc";f=this.store&&sa(this.store);b=null;break;default:return}return ya.call(this,a,b,d,f,c,e)};
 u.import=function(a,b){var c=a.split(".");"json"===c[c.length-1]&&c.pop();const e=2<c.length?c[0]:"";c=2<c.length?c[2]:c[1];if(this.worker&&e)return this.index.get(e).import(a);if(b){"string"===typeof b&&(b=JSON.parse(b));if(e)return this.index.get(e).import(c,b);switch(c){case "reg":this.fastupdate=!1;this.reg=xa(b,this.reg);for(let d=0,f;d<this.field.length;d++)f=this.index.get(this.field[d]),f.fastupdate=!1,f.reg=this.reg;if(this.worker){b=[];for(const d of this.index.values())b.push(d.import(a));
-return Promise.all(b)}break;case "tag":this.tag=va(b,this.tag);break;case "doc":this.store=ta(b,this.store)}}};la(U.prototype);function Va(a,b,c){a=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let e=this.cache.get(a);if(!e){e=this.search(a,b,c);if(e.then){const d=this;e.then(function(f){d.cache.set(a,f);return f})}this.cache.set(a,e)}return e}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,b){this.cache.set(this.h=a,b);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
+return Promise.all(b)}break;case "tag":this.tag=va(b,this.tag);break;case "doc":this.store=ta(b,this.store)}}};la(U.prototype);function Va(a,b,c){const e=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let d=this.cache.get(e);if(!d){d=this.search(a,b,c);if(d.then){const f=this;d.then(function(g){f.cache.set(e,g);return g})}this.cache.set(e,d)}return d}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,b){this.cache.set(this.h=a,b);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
 X.prototype.get=function(a){const b=this.cache.get(a);b&&this.h!==a&&(this.cache.delete(a),this.cache.set(this.h=a,b));return b};X.prototype.remove=function(a){for(const b of this.cache){const c=b[0];b[1].includes(a)&&this.cache.delete(c)}};X.prototype.clear=function(){this.cache.clear();this.h=""};const Wa={normalize:!1,numeric:!1,dedupe:!1};const Xa={};const Ya=new Map([["b","p"],["v","f"],["w","f"],["z","s"],["x","s"],["d","t"],["n","m"],["c","k"],["g","k"],["j","k"],["q","k"],["i","e"],["y","e"],["u","o"]]);const Za=new Map([["ae","a"],["oe","o"],["sh","s"],["kh","k"],["th","t"],["ph","f"],["pf","f"]]),$a=[/([^aeo])h(.)/g,"$1$2",/([aeo])h([^aeo]|$)/g,"$1$2",/(.)\1+/g,"$1"];const ab={a:"",e:"",i:"",o:"",u:"",y:"",b:1,f:1,p:1,v:1,c:2,g:2,j:2,k:2,q:2,s:2,x:2,z:2,"\u00df":2,d:3,t:3,l:4,m:5,n:5,r:6};var bb={Exact:Wa,Default:Xa,Normalize:Xa,LatinBalance:{mapper:Ya},LatinAdvanced:{mapper:Ya,matcher:Za,replacer:$a},LatinExtra:{mapper:Ya,replacer:$a.concat([/(?!^)[aeo]/g,""]),matcher:Za},LatinSoundex:{dedupe:!1,include:{letter:!0},finalize:function(a){for(let c=0;c<a.length;c++){var b=a[c];let e=b.charAt(0),d=ab[e];for(let f=1,g;f<b.length&&(g=b.charAt(f),"h"===g||"w"===g||!(g=ab[g])||g===d||(e+=g,d=g,4!==e.length));f++);a[c]=e}}},CJK:{split:""},LatinExact:Wa,LatinDefault:Xa,LatinSimple:Xa};M.prototype.remove=function(a,b){const c=this.reg.size&&(this.fastupdate?this.reg.get(a):this.reg.has(a));if(c){if(this.fastupdate)for(let e=0,d;e<c.length;e++){if(d=c[e])if(2>d.length)d.pop();else{const f=d.indexOf(a);f===c.length-1?d.pop():d.splice(f,1)}}else cb(this.map,a),this.depth&&cb(this.ctx,a);b||this.reg.delete(a)}this.db&&(this.commit_task.push({del:a}),this.T&&db(this));this.cache&&this.cache.remove(a);return this};
 function cb(a,b){let c=0;var e="undefined"===typeof b;if(a.constructor===Array)for(let d=0,f,g;d<a.length;d++){if((f=a[d])&&f.length)if(e)c++;else if(g=f.indexOf(b),0<=g){1<f.length?(f.splice(g,1),c++):delete a[d];break}else c++}else for(let d of a.entries()){e=d[0];const f=cb(d[1],b);f?c+=f:a.delete(e)}return c};const eb={memory:{resolution:1},performance:{resolution:3,fastupdate:!0,context:{depth:1,resolution:1}},match:{tokenize:"forward"},score:{resolution:9,context:{depth:2,resolution:3}}};M.prototype.add=function(a,b,c,e){if(b&&(a||0===a)){if(!e&&!c&&this.reg.has(a))return this.update(a,b);b=this.encoder.encode(b);if(e=b.length){const l=B(),n=B(),m=this.depth,q=this.resolution;for(let p=0;p<e;p++){let r=b[this.rtl?e-1-p:p];var d=r.length;if(d&&(m||!n[r])){var f=this.score?this.score(b,r,p,null,0):fb(q,e,p),g="";switch(this.tokenize){case "full":if(2<d){for(let t=0,v;t<d;t++)for(f=d;f>t;f--){g=r.substring(t,f);v=this.rtl?d-1-t:t;var k=this.score?this.score(b,r,p,g,v):fb(q,e,p,d,v);
 gb(this,n,g,k,a,c)}break}case "bidirectional":case "reverse":if(1<d){for(k=d-1;0<k;k--){g=r[this.rtl?d-1-k:k]+g;var h=this.score?this.score(b,r,p,g,k):fb(q,e,p,d,k);gb(this,n,g,h,a,c)}g=""}case "forward":if(1<d){for(k=0;k<d;k++)g+=r[this.rtl?d-1-k:k],gb(this,n,g,f,a,c);break}default:if(gb(this,n,r,f,a,c),m&&1<e&&p<e-1)for(d=B(),g=this.U,f=r,k=Math.min(m+1,this.rtl?p+1:e-p),d[f]=1,h=1;h<k;h++)if((r=b[this.rtl?e-1-p-h:p+h])&&!d[r]){d[r]=1;const t=this.score?this.score(b,f,p,r,h-1):fb(g+(e/2>g?0:1),
diff --git a/dist/flexsearch.bundle.module.debug.js b/dist/flexsearch.bundle.module.debug.js
index f1ba3b9..ba251f7 100644
--- a/dist/flexsearch.bundle.module.debug.js
+++ b/dist/flexsearch.bundle.module.debug.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle/Module/Debug)
+ * FlexSearch.js v0.8.154 (Bundle/Module/Debug)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -1767,21 +1767,21 @@ v.import = function(a, c) {
 };
 la(U.prototype);
 function Va(a, c, b) {
-  a = ("object" === typeof a ? "" + a.query : a).toLowerCase();
+  const e = ("object" === typeof a ? "" + a.query : a).toLowerCase();
   this.cache || (this.cache = new X());
-  let e = this.cache.get(a);
-  if (!e) {
-    e = this.search(a, c, b);
-    if (e.then) {
-      const d = this;
-      e.then(function(f) {
-        d.cache.set(a, f);
-        return f;
+  let d = this.cache.get(e);
+  if (!d) {
+    d = this.search(a, c, b);
+    if (d.then) {
+      const f = this;
+      d.then(function(g) {
+        f.cache.set(e, g);
+        return g;
       });
     }
-    this.cache.set(a, e);
+    this.cache.set(e, d);
   }
-  return e;
+  return d;
 }
 function X(a) {
   this.limit = a && !0 !== a ? a : 1000;
diff --git a/dist/flexsearch.bundle.module.min.js b/dist/flexsearch.bundle.module.min.js
index 5b515e7..a4bc7e9 100644
--- a/dist/flexsearch.bundle.module.min.js
+++ b/dist/flexsearch.bundle.module.min.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle/Module)
+ * FlexSearch.js v0.8.154 (Bundle/Module)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -63,7 +63,7 @@ u.clear=function(){const a=[];for(const b of this.index.values()){const c=b.clea
 u.get=function(a){return this.db?this.index.get(this.field[0]).db.enrich(a).then(function(b){return b[0]&&b[0].doc||null}):this.store.get(a)||null};u.set=function(a,b){"object"===typeof a&&(b=a,a=I(b,this.key));this.store.set(a,b);return this};u.searchCache=Va;
 u.export=function(a,b,c=0,e=0){if(c<this.field.length){const g=this.field[c];if((b=this.index.get(g).export(a,g,c,e=1))&&b.then){const k=this;return b.then(function(){return k.export(a,g,c+1)})}return this.export(a,g,c+1)}let d,f;switch(e){case 0:d="reg";f=wa(this.reg);b=null;break;case 1:d="tag";f=this.tag&&ua(this.tag,this.reg.size);b=null;break;case 2:d="doc";f=this.store&&sa(this.store);b=null;break;default:return}return ya.call(this,a,b,d,f,c,e)};
 u.import=function(a,b){var c=a.split(".");"json"===c[c.length-1]&&c.pop();const e=2<c.length?c[0]:"";c=2<c.length?c[2]:c[1];if(this.worker&&e)return this.index.get(e).import(a);if(b){"string"===typeof b&&(b=JSON.parse(b));if(e)return this.index.get(e).import(c,b);switch(c){case "reg":this.fastupdate=!1;this.reg=xa(b,this.reg);for(let d=0,f;d<this.field.length;d++)f=this.index.get(this.field[d]),f.fastupdate=!1,f.reg=this.reg;if(this.worker){b=[];for(const d of this.index.values())b.push(d.import(a));
-return Promise.all(b)}break;case "tag":this.tag=va(b,this.tag);break;case "doc":this.store=ta(b,this.store)}}};la(U.prototype);function Va(a,b,c){a=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let e=this.cache.get(a);if(!e){e=this.search(a,b,c);if(e.then){const d=this;e.then(function(f){d.cache.set(a,f);return f})}this.cache.set(a,e)}return e}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,b){this.cache.set(this.h=a,b);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
+return Promise.all(b)}break;case "tag":this.tag=va(b,this.tag);break;case "doc":this.store=ta(b,this.store)}}};la(U.prototype);function Va(a,b,c){const e=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let d=this.cache.get(e);if(!d){d=this.search(a,b,c);if(d.then){const f=this;d.then(function(g){f.cache.set(e,g);return g})}this.cache.set(e,d)}return d}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,b){this.cache.set(this.h=a,b);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
 X.prototype.get=function(a){const b=this.cache.get(a);b&&this.h!==a&&(this.cache.delete(a),this.cache.set(this.h=a,b));return b};X.prototype.remove=function(a){for(const b of this.cache){const c=b[0];b[1].includes(a)&&this.cache.delete(c)}};X.prototype.clear=function(){this.cache.clear();this.h=""};const Wa={normalize:!1,numeric:!1,dedupe:!1};const Xa={};const Ya=new Map([["b","p"],["v","f"],["w","f"],["z","s"],["x","s"],["d","t"],["n","m"],["c","k"],["g","k"],["j","k"],["q","k"],["i","e"],["y","e"],["u","o"]]);const Za=new Map([["ae","a"],["oe","o"],["sh","s"],["kh","k"],["th","t"],["ph","f"],["pf","f"]]),$a=[/([^aeo])h(.)/g,"$1$2",/([aeo])h([^aeo]|$)/g,"$1$2",/(.)\1+/g,"$1"];const ab={a:"",e:"",i:"",o:"",u:"",y:"",b:1,f:1,p:1,v:1,c:2,g:2,j:2,k:2,q:2,s:2,x:2,z:2,"\u00df":2,d:3,t:3,l:4,m:5,n:5,r:6};var bb={Exact:Wa,Default:Xa,Normalize:Xa,LatinBalance:{mapper:Ya},LatinAdvanced:{mapper:Ya,matcher:Za,replacer:$a},LatinExtra:{mapper:Ya,replacer:$a.concat([/(?!^)[aeo]/g,""]),matcher:Za},LatinSoundex:{dedupe:!1,include:{letter:!0},finalize:function(a){for(let c=0;c<a.length;c++){var b=a[c];let e=b.charAt(0),d=ab[e];for(let f=1,g;f<b.length&&(g=b.charAt(f),"h"===g||"w"===g||!(g=ab[g])||g===d||(e+=g,d=g,4!==e.length));f++);a[c]=e}}},CJK:{split:""},LatinExact:Wa,LatinDefault:Xa,LatinSimple:Xa};M.prototype.remove=function(a,b){const c=this.reg.size&&(this.fastupdate?this.reg.get(a):this.reg.has(a));if(c){if(this.fastupdate)for(let e=0,d;e<c.length;e++){if(d=c[e])if(2>d.length)d.pop();else{const f=d.indexOf(a);f===c.length-1?d.pop():d.splice(f,1)}}else cb(this.map,a),this.depth&&cb(this.ctx,a);b||this.reg.delete(a)}this.db&&(this.commit_task.push({del:a}),this.T&&db(this));this.cache&&this.cache.remove(a);return this};
 function cb(a,b){let c=0;var e="undefined"===typeof b;if(a.constructor===Array)for(let d=0,f,g;d<a.length;d++){if((f=a[d])&&f.length)if(e)c++;else if(g=f.indexOf(b),0<=g){1<f.length?(f.splice(g,1),c++):delete a[d];break}else c++}else for(let d of a.entries()){e=d[0];const f=cb(d[1],b);f?c+=f:a.delete(e)}return c};const eb={memory:{resolution:1},performance:{resolution:3,fastupdate:!0,context:{depth:1,resolution:1}},match:{tokenize:"forward"},score:{resolution:9,context:{depth:2,resolution:3}}};M.prototype.add=function(a,b,c,e){if(b&&(a||0===a)){if(!e&&!c&&this.reg.has(a))return this.update(a,b);b=this.encoder.encode(b);if(e=b.length){const l=B(),n=B(),m=this.depth,q=this.resolution;for(let p=0;p<e;p++){let r=b[this.rtl?e-1-p:p];var d=r.length;if(d&&(m||!n[r])){var f=this.score?this.score(b,r,p,null,0):fb(q,e,p),g="";switch(this.tokenize){case "full":if(2<d){for(let t=0,v;t<d;t++)for(f=d;f>t;f--){g=r.substring(t,f);v=this.rtl?d-1-t:t;var k=this.score?this.score(b,r,p,g,v):fb(q,e,p,d,v);
 gb(this,n,g,k,a,c)}break}case "bidirectional":case "reverse":if(1<d){for(k=d-1;0<k;k--){g=r[this.rtl?d-1-k:k]+g;var h=this.score?this.score(b,r,p,g,k):fb(q,e,p,d,k);gb(this,n,g,h,a,c)}g=""}case "forward":if(1<d){for(k=0;k<d;k++)g+=r[this.rtl?d-1-k:k],gb(this,n,g,f,a,c);break}default:if(gb(this,n,r,f,a,c),m&&1<e&&p<e-1)for(d=B(),g=this.U,f=r,k=Math.min(m+1,this.rtl?p+1:e-p),d[f]=1,h=1;h<k;h++)if((r=b[this.rtl?e-1-p-h:p+h])&&!d[r]){d[r]=1;const t=this.score?this.score(b,f,p,r,h-1):fb(g+(e/2>g?0:1),
diff --git a/dist/flexsearch.compact.debug.js b/dist/flexsearch.compact.debug.js
index c71386b..4a23caf 100644
--- a/dist/flexsearch.compact.debug.js
+++ b/dist/flexsearch.compact.debug.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle/Debug)
+ * FlexSearch.js v0.8.154 (Bundle/Debug)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -1350,21 +1350,21 @@ w.import = function(a, c) {
 };
 ia(U.prototype);
 function Ma(a, c, b) {
-  a = ("object" === typeof a ? "" + a.query : a).toLowerCase();
+  const e = ("object" === typeof a ? "" + a.query : a).toLowerCase();
   this.cache || (this.cache = new X());
-  let e = this.cache.get(a);
-  if (!e) {
-    e = this.search(a, c, b);
-    if (e.then) {
-      const d = this;
-      e.then(function(f) {
-        d.cache.set(a, f);
-        return f;
+  let d = this.cache.get(e);
+  if (!d) {
+    d = this.search(a, c, b);
+    if (d.then) {
+      const f = this;
+      d.then(function(g) {
+        f.cache.set(e, g);
+        return g;
       });
     }
-    this.cache.set(a, e);
+    this.cache.set(e, d);
   }
-  return e;
+  return d;
 }
 function X(a) {
   this.limit = a && !0 !== a ? a : 1000;
diff --git a/dist/flexsearch.compact.min.js b/dist/flexsearch.compact.min.js
index 205f625..e9c7855 100644
--- a/dist/flexsearch.compact.min.js
+++ b/dist/flexsearch.compact.min.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle)
+ * FlexSearch.js v0.8.154 (Bundle)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -50,7 +50,7 @@ w.remove=function(a){G(a)&&(a=H(a,this.key));for(var c of this.index.values())c.
 w.clear=function(){const a=[];for(const c of this.index.values()){const b=c.clear();b.then&&a.push(b)}if(this.tag)for(const c of this.tag.values())c.clear();this.store&&this.store.clear();this.cache&&this.cache.clear();return a.length?Promise.all(a):this};w.contain=function(a){return this.reg.has(a)};w.cleanup=function(){for(const a of this.index.values())a.cleanup();return this};w.get=function(a){return this.store.get(a)||null};
 w.set=function(a,c){"object"===typeof a&&(c=a,a=H(c,this.key));this.store.set(a,c);return this};w.searchCache=Ma;
 w.export=function(a,c,b=0,e=0){if(b<this.field.length){const g=this.field[b];if((c=this.index.get(g).export(a,g,b,e=1))&&c.then){const k=this;return c.then(function(){return k.export(a,g,b+1)})}return this.export(a,g,b+1)}let d,f;switch(e){case 0:d="reg";f=ra(this.reg);c=null;break;case 1:d="tag";f=this.tag&&pa(this.tag,this.reg.size);c=null;break;case 2:d="doc";f=this.store&&na(this.store);c=null;break;default:return}return ta.call(this,a,c,d,f,b,e)};
-w.import=function(a,c){var b=a.split(".");"json"===b[b.length-1]&&b.pop();a=2<b.length?b[0]:"";b=2<b.length?b[2]:b[1];if(c){"string"===typeof c&&(c=JSON.parse(c));if(a)return this.index.get(a).import(b,c);switch(b){case "reg":this.fastupdate=!1;this.reg=sa(c,this.reg);for(let e=0,d;e<this.field.length;e++)d=this.index.get(this.field[e]),d.fastupdate=!1,d.reg=this.reg;break;case "tag":this.tag=qa(c,this.tag);break;case "doc":this.store=oa(c,this.store)}}};ia(U.prototype);function Ma(a,c,b){a=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let e=this.cache.get(a);if(!e){e=this.search(a,c,b);if(e.then){const d=this;e.then(function(f){d.cache.set(a,f);return f})}this.cache.set(a,e)}return e}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,c){this.cache.set(this.h=a,c);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
+w.import=function(a,c){var b=a.split(".");"json"===b[b.length-1]&&b.pop();a=2<b.length?b[0]:"";b=2<b.length?b[2]:b[1];if(c){"string"===typeof c&&(c=JSON.parse(c));if(a)return this.index.get(a).import(b,c);switch(b){case "reg":this.fastupdate=!1;this.reg=sa(c,this.reg);for(let e=0,d;e<this.field.length;e++)d=this.index.get(this.field[e]),d.fastupdate=!1,d.reg=this.reg;break;case "tag":this.tag=qa(c,this.tag);break;case "doc":this.store=oa(c,this.store)}}};ia(U.prototype);function Ma(a,c,b){const e=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let d=this.cache.get(e);if(!d){d=this.search(a,c,b);if(d.then){const f=this;d.then(function(g){f.cache.set(e,g);return g})}this.cache.set(e,d)}return d}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,c){this.cache.set(this.h=a,c);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
 X.prototype.get=function(a){const c=this.cache.get(a);c&&this.h!==a&&(this.cache.delete(a),this.cache.set(this.h=a,c));return c};X.prototype.remove=function(a){for(const c of this.cache){const b=c[0];c[1].includes(a)&&this.cache.delete(b)}};X.prototype.clear=function(){this.cache.clear();this.h=""};const Na={normalize:!1,numeric:!1,dedupe:!1};const Oa={};const Pa=new Map([["b","p"],["v","f"],["w","f"],["z","s"],["x","s"],["d","t"],["n","m"],["c","k"],["g","k"],["j","k"],["q","k"],["i","e"],["y","e"],["u","o"]]);const Qa=new Map([["ae","a"],["oe","o"],["sh","s"],["kh","k"],["th","t"],["ph","f"],["pf","f"]]),Ra=[/([^aeo])h(.)/g,"$1$2",/([aeo])h([^aeo]|$)/g,"$1$2",/(.)\1+/g,"$1"];const Sa={a:"",e:"",i:"",o:"",u:"",y:"",b:1,f:1,p:1,v:1,c:2,g:2,j:2,k:2,q:2,s:2,x:2,z:2,"\u00df":2,d:3,t:3,l:4,m:5,n:5,r:6};var Ta={Exact:Na,Default:Oa,Normalize:Oa,LatinBalance:{mapper:Pa},LatinAdvanced:{mapper:Pa,matcher:Qa,replacer:Ra},LatinExtra:{mapper:Pa,replacer:Ra.concat([/(?!^)[aeo]/g,""]),matcher:Qa},LatinSoundex:{dedupe:!1,include:{letter:!0},finalize:function(a){for(let b=0;b<a.length;b++){var c=a[b];let e=c.charAt(0),d=Sa[e];for(let f=1,g;f<c.length&&(g=c.charAt(f),"h"===g||"w"===g||!(g=Sa[g])||g===d||(e+=g,d=g,4!==e.length));f++);a[b]=e}}},CJK:{split:""},LatinExact:Na,LatinDefault:Oa,LatinSimple:Oa};O.prototype.remove=function(a,c){const b=this.reg.size&&(this.fastupdate?this.reg.get(a):this.reg.has(a));if(b){if(this.fastupdate)for(let e=0,d;e<b.length;e++){if(d=b[e])if(2>d.length)d.pop();else{const f=d.indexOf(a);f===b.length-1?d.pop():d.splice(f,1)}}else Y(this.map,a),this.depth&&Y(this.ctx,a);c||this.reg.delete(a)}this.cache&&this.cache.remove(a);return this};
 function Y(a,c){let b=0;var e="undefined"===typeof c;if(a.constructor===Array)for(let d=0,f,g;d<a.length;d++){if((f=a[d])&&f.length)if(e)b++;else if(g=f.indexOf(c),0<=g){1<f.length?(f.splice(g,1),b++):delete a[d];break}else b++}else for(let d of a.entries()){e=d[0];const f=Y(d[1],c);f?b+=f:a.delete(e)}return b};const Ua={memory:{resolution:1},performance:{resolution:3,fastupdate:!0,context:{depth:1,resolution:1}},match:{tokenize:"forward"},score:{resolution:9,context:{depth:2,resolution:3}}};O.prototype.add=function(a,c,b,e){if(c&&(a||0===a)){if(!e&&!b&&this.reg.has(a))return this.update(a,c);c=this.encoder.encode(c);if(e=c.length){const l=C(),m=C(),n=this.depth,v=this.resolution;for(let p=0;p<e;p++){let q=c[this.rtl?e-1-p:p];var d=q.length;if(d&&(n||!m[q])){var f=this.score?this.score(c,q,p,null,0):Va(v,e,p),g="";switch(this.tokenize){case "full":if(2<d){for(let t=0,u;t<d;t++)for(f=d;f>t;f--){g=q.substring(t,f);u=this.rtl?d-1-t:t;var k=this.score?this.score(c,q,p,g,u):Va(v,e,p,d,u);
 Z(this,m,g,k,a,b)}break}case "bidirectional":case "reverse":if(1<d){for(k=d-1;0<k;k--){g=q[this.rtl?d-1-k:k]+g;var h=this.score?this.score(c,q,p,g,k):Va(v,e,p,d,k);Z(this,m,g,h,a,b)}g=""}case "forward":if(1<d){for(k=0;k<d;k++)g+=q[this.rtl?d-1-k:k],Z(this,m,g,f,a,b);break}default:if(Z(this,m,q,f,a,b),n&&1<e&&p<e-1)for(d=C(),g=this.S,f=q,k=Math.min(n+1,this.rtl?p+1:e-p),d[f]=1,h=1;h<k;h++)if((q=c[this.rtl?e-1-p-h:p+h])&&!d[q]){d[q]=1;const t=this.score?this.score(c,f,p,q,h-1):Va(g+(e/2>g?0:1),e,p,
diff --git a/dist/flexsearch.compact.module.debug.js b/dist/flexsearch.compact.module.debug.js
index 61b7618..fec975f 100644
--- a/dist/flexsearch.compact.module.debug.js
+++ b/dist/flexsearch.compact.module.debug.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle/Debug)
+ * FlexSearch.js v0.8.154 (Bundle/Debug)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -1349,21 +1349,21 @@ w.import = function(a, c) {
 };
 ia(U.prototype);
 function Ma(a, c, b) {
-  a = ("object" === typeof a ? "" + a.query : a).toLowerCase();
+  const e = ("object" === typeof a ? "" + a.query : a).toLowerCase();
   this.cache || (this.cache = new X());
-  let e = this.cache.get(a);
-  if (!e) {
-    e = this.search(a, c, b);
-    if (e.then) {
-      const d = this;
-      e.then(function(f) {
-        d.cache.set(a, f);
-        return f;
+  let d = this.cache.get(e);
+  if (!d) {
+    d = this.search(a, c, b);
+    if (d.then) {
+      const f = this;
+      d.then(function(g) {
+        f.cache.set(e, g);
+        return g;
       });
     }
-    this.cache.set(a, e);
+    this.cache.set(e, d);
   }
-  return e;
+  return d;
 }
 function X(a) {
   this.limit = a && !0 !== a ? a : 1000;
diff --git a/dist/flexsearch.compact.module.min.js b/dist/flexsearch.compact.module.min.js
index 5426103..70c1531 100644
--- a/dist/flexsearch.compact.module.min.js
+++ b/dist/flexsearch.compact.module.min.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle)
+ * FlexSearch.js v0.8.154 (Bundle)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -50,7 +50,7 @@ w.remove=function(a){G(a)&&(a=H(a,this.key));for(var c of this.index.values())c.
 w.clear=function(){const a=[];for(const c of this.index.values()){const b=c.clear();b.then&&a.push(b)}if(this.tag)for(const c of this.tag.values())c.clear();this.store&&this.store.clear();this.cache&&this.cache.clear();return a.length?Promise.all(a):this};w.contain=function(a){return this.reg.has(a)};w.cleanup=function(){for(const a of this.index.values())a.cleanup();return this};w.get=function(a){return this.store.get(a)||null};
 w.set=function(a,c){"object"===typeof a&&(c=a,a=H(c,this.key));this.store.set(a,c);return this};w.searchCache=Ma;
 w.export=function(a,c,b=0,e=0){if(b<this.field.length){const g=this.field[b];if((c=this.index.get(g).export(a,g,b,e=1))&&c.then){const k=this;return c.then(function(){return k.export(a,g,b+1)})}return this.export(a,g,b+1)}let d,f;switch(e){case 0:d="reg";f=ra(this.reg);c=null;break;case 1:d="tag";f=this.tag&&pa(this.tag,this.reg.size);c=null;break;case 2:d="doc";f=this.store&&na(this.store);c=null;break;default:return}return ta.call(this,a,c,d,f,b,e)};
-w.import=function(a,c){var b=a.split(".");"json"===b[b.length-1]&&b.pop();a=2<b.length?b[0]:"";b=2<b.length?b[2]:b[1];if(c){"string"===typeof c&&(c=JSON.parse(c));if(a)return this.index.get(a).import(b,c);switch(b){case "reg":this.fastupdate=!1;this.reg=sa(c,this.reg);for(let e=0,d;e<this.field.length;e++)d=this.index.get(this.field[e]),d.fastupdate=!1,d.reg=this.reg;break;case "tag":this.tag=qa(c,this.tag);break;case "doc":this.store=oa(c,this.store)}}};ia(U.prototype);function Ma(a,c,b){a=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let e=this.cache.get(a);if(!e){e=this.search(a,c,b);if(e.then){const d=this;e.then(function(f){d.cache.set(a,f);return f})}this.cache.set(a,e)}return e}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,c){this.cache.set(this.h=a,c);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
+w.import=function(a,c){var b=a.split(".");"json"===b[b.length-1]&&b.pop();a=2<b.length?b[0]:"";b=2<b.length?b[2]:b[1];if(c){"string"===typeof c&&(c=JSON.parse(c));if(a)return this.index.get(a).import(b,c);switch(b){case "reg":this.fastupdate=!1;this.reg=sa(c,this.reg);for(let e=0,d;e<this.field.length;e++)d=this.index.get(this.field[e]),d.fastupdate=!1,d.reg=this.reg;break;case "tag":this.tag=qa(c,this.tag);break;case "doc":this.store=oa(c,this.store)}}};ia(U.prototype);function Ma(a,c,b){const e=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);let d=this.cache.get(e);if(!d){d=this.search(a,c,b);if(d.then){const f=this;d.then(function(g){f.cache.set(e,g);return g})}this.cache.set(e,d)}return d}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,c){this.cache.set(this.h=a,c);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
 X.prototype.get=function(a){const c=this.cache.get(a);c&&this.h!==a&&(this.cache.delete(a),this.cache.set(this.h=a,c));return c};X.prototype.remove=function(a){for(const c of this.cache){const b=c[0];c[1].includes(a)&&this.cache.delete(b)}};X.prototype.clear=function(){this.cache.clear();this.h=""};const Na={normalize:!1,numeric:!1,dedupe:!1};const Oa={};const Pa=new Map([["b","p"],["v","f"],["w","f"],["z","s"],["x","s"],["d","t"],["n","m"],["c","k"],["g","k"],["j","k"],["q","k"],["i","e"],["y","e"],["u","o"]]);const Qa=new Map([["ae","a"],["oe","o"],["sh","s"],["kh","k"],["th","t"],["ph","f"],["pf","f"]]),Ra=[/([^aeo])h(.)/g,"$1$2",/([aeo])h([^aeo]|$)/g,"$1$2",/(.)\1+/g,"$1"];const Sa={a:"",e:"",i:"",o:"",u:"",y:"",b:1,f:1,p:1,v:1,c:2,g:2,j:2,k:2,q:2,s:2,x:2,z:2,"\u00df":2,d:3,t:3,l:4,m:5,n:5,r:6};var Ta={Exact:Na,Default:Oa,Normalize:Oa,LatinBalance:{mapper:Pa},LatinAdvanced:{mapper:Pa,matcher:Qa,replacer:Ra},LatinExtra:{mapper:Pa,replacer:Ra.concat([/(?!^)[aeo]/g,""]),matcher:Qa},LatinSoundex:{dedupe:!1,include:{letter:!0},finalize:function(a){for(let b=0;b<a.length;b++){var c=a[b];let e=c.charAt(0),d=Sa[e];for(let f=1,g;f<c.length&&(g=c.charAt(f),"h"===g||"w"===g||!(g=Sa[g])||g===d||(e+=g,d=g,4!==e.length));f++);a[b]=e}}},CJK:{split:""},LatinExact:Na,LatinDefault:Oa,LatinSimple:Oa};O.prototype.remove=function(a,c){const b=this.reg.size&&(this.fastupdate?this.reg.get(a):this.reg.has(a));if(b){if(this.fastupdate)for(let e=0,d;e<b.length;e++){if(d=b[e])if(2>d.length)d.pop();else{const f=d.indexOf(a);f===b.length-1?d.pop():d.splice(f,1)}}else Y(this.map,a),this.depth&&Y(this.ctx,a);c||this.reg.delete(a)}this.cache&&this.cache.remove(a);return this};
 function Y(a,c){let b=0;var e="undefined"===typeof c;if(a.constructor===Array)for(let d=0,f,g;d<a.length;d++){if((f=a[d])&&f.length)if(e)b++;else if(g=f.indexOf(c),0<=g){1<f.length?(f.splice(g,1),b++):delete a[d];break}else b++}else for(let d of a.entries()){e=d[0];const f=Y(d[1],c);f?b+=f:a.delete(e)}return b};const Va={memory:{resolution:1},performance:{resolution:3,fastupdate:!0,context:{depth:1,resolution:1}},match:{tokenize:"forward"},score:{resolution:9,context:{depth:2,resolution:3}}};O.prototype.add=function(a,c,b,e){if(c&&(a||0===a)){if(!e&&!b&&this.reg.has(a))return this.update(a,c);c=this.encoder.encode(c);if(e=c.length){const l=C(),m=C(),n=this.depth,v=this.resolution;for(let p=0;p<e;p++){let q=c[this.rtl?e-1-p:p];var d=q.length;if(d&&(n||!m[q])){var f=this.score?this.score(c,q,p,null,0):Wa(v,e,p),g="";switch(this.tokenize){case "full":if(2<d){for(let t=0,u;t<d;t++)for(f=d;f>t;f--){g=q.substring(t,f);u=this.rtl?d-1-t:t;var k=this.score?this.score(c,q,p,g,u):Wa(v,e,p,d,u);
 Z(this,m,g,k,a,b)}break}case "bidirectional":case "reverse":if(1<d){for(k=d-1;0<k;k--){g=q[this.rtl?d-1-k:k]+g;var h=this.score?this.score(c,q,p,g,k):Wa(v,e,p,d,k);Z(this,m,g,h,a,b)}g=""}case "forward":if(1<d){for(k=0;k<d;k++)g+=q[this.rtl?d-1-k:k],Z(this,m,g,f,a,b);break}default:if(Z(this,m,q,f,a,b),n&&1<e&&p<e-1)for(d=C(),g=this.S,f=q,k=Math.min(n+1,this.rtl?p+1:e-p),d[f]=1,h=1;h<k;h++)if((q=c[this.rtl?e-1-p-h:p+h])&&!d[q]){d[q]=1;const t=this.score?this.score(c,f,p,q,h-1):Wa(g+(e/2>g?0:1),e,p,
diff --git a/dist/flexsearch.es5.debug.js b/dist/flexsearch.es5.debug.js
index 9ab7ea5..3f12e8d 100644
--- a/dist/flexsearch.es5.debug.js
+++ b/dist/flexsearch.es5.debug.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (ES5/Debug)
+ * FlexSearch.js v0.8.154 (ES5/Debug)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -2690,21 +2690,21 @@ u.import = function(a, b) {
 };
 Ja(V.prototype);
 function zb(a, b, c) {
-  a = ("object" === typeof a ? "" + a.query : a).toLowerCase();
+  var d = ("object" === typeof a ? "" + a.query : a).toLowerCase();
   this.cache || (this.cache = new Y());
-  var d = this.cache.get(a);
-  if (!d) {
-    d = this.search(a, b, c);
-    if (d.then) {
-      var e = this;
-      d.then(function(g) {
-        e.cache.set(a, g);
-        return g;
+  var e = this.cache.get(d);
+  if (!e) {
+    e = this.search(a, b, c);
+    if (e.then) {
+      var g = this;
+      e.then(function(f) {
+        g.cache.set(d, f);
+        return f;
       });
     }
-    this.cache.set(a, d);
+    this.cache.set(d, e);
   }
-  return d;
+  return e;
 }
 function Y(a) {
   this.limit = a && !0 !== a ? a : 1000;
diff --git a/dist/flexsearch.es5.min.js b/dist/flexsearch.es5.min.js
index b56ffb3..e64b1b8 100644
--- a/dist/flexsearch.es5.min.js
+++ b/dist/flexsearch.es5.min.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (ES5)
+ * FlexSearch.js v0.8.154 (ES5)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
@@ -99,7 +99,7 @@ u.clear=function(){for(var a=[],b=x(this.index.values()),c=b.next();!c.done;c=b.
 u.cleanup=function(){for(var a=x(this.index.values()),b=a.next();!b.done;b=a.next())b.value.cleanup();return this};u.get=function(a){return this.db?this.index.get(this.field[0]).db.enrich(a).then(function(b){return b[0]&&b[0].doc||null}):this.store.get(a)||null};u.set=function(a,b){"object"===typeof a&&(b=a,a=za(b,this.key));this.store.set(a,b);return this};u.searchCache=Ab;
 u.export=function(a,b,c,d){c=void 0===c?0:c;d=void 0===d?0:d;if(c<this.field.length){var e=this.field[c];if((b=this.index.get(e).export(a,e,c,d=1))&&b.then){var g=this;return b.then(function(){return g.export(a,e,c+1)})}return this.export(a,e,c+1)}switch(d){case 0:var f="reg";var h=Za(this.reg);b=null;break;case 1:f="tag";h=this.tag&&Xa(this.tag,this.reg.size);b=null;break;case 2:f="doc";h=this.store&&Va(this.store);b=null;break;default:return}return ab.call(this,a,b,f,h,c,d)};
 u.import=function(a,b){var c=a.split(".");"json"===c[c.length-1]&&c.pop();var d=2<c.length?c[0]:"";c=2<c.length?c[2]:c[1];if(this.worker&&d)return this.index.get(d).import(a);if(b){"string"===typeof b&&(b=JSON.parse(b));if(d)return this.index.get(d).import(c,b);switch(c){case "reg":this.fastupdate=!1;this.reg=$a(b,this.reg);for(b=0;b<this.field.length;b++)d=this.index.get(this.field[b]),d.fastupdate=!1,d.reg=this.reg;if(this.worker){b=[];d=x(this.index.values());for(c=d.next();!c.done;c=d.next())b.push(c.value.import(a));
-return Promise.all(b)}break;case "tag":this.tag=Ya(b,this.tag);break;case "doc":this.store=Wa(b,this.store)}}};Ka(U.prototype);function Ab(a,b,c){a=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);var d=this.cache.get(a);if(!d){d=this.search(a,b,c);if(d.then){var e=this;d.then(function(g){e.cache.set(a,g);return g})}this.cache.set(a,d)}return d}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,b){this.cache.set(this.h=a,b);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
+return Promise.all(b)}break;case "tag":this.tag=Ya(b,this.tag);break;case "doc":this.store=Wa(b,this.store)}}};Ka(U.prototype);function Ab(a,b,c){var d=("object"===typeof a?""+a.query:a).toLowerCase();this.cache||(this.cache=new X);var e=this.cache.get(d);if(!e){e=this.search(a,b,c);if(e.then){var g=this;e.then(function(f){g.cache.set(d,f);return f})}this.cache.set(d,e)}return e}function X(a){this.limit=a&&!0!==a?a:1E3;this.cache=new Map;this.h=""}X.prototype.set=function(a,b){this.cache.set(this.h=a,b);this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)};
 X.prototype.get=function(a){var b=this.cache.get(a);b&&this.h!==a&&(this.cache.delete(a),this.cache.set(this.h=a,b));return b};X.prototype.remove=function(a){for(var b=x(this.cache),c=b.next();!c.done;c=b.next()){c=c.value;var d=c[0];c[1].includes(a)&&this.cache.delete(d)}};X.prototype.clear=function(){this.cache.clear();this.h=""};var Bb={normalize:!1,numeric:!1,dedupe:!1};var Cb={};var Db=new Map([["b","p"],["v","f"],["w","f"],["z","s"],["x","s"],["d","t"],["n","m"],["c","k"],["g","k"],["j","k"],["q","k"],["i","e"],["y","e"],["u","o"]]);var Eb=new Map([["ae","a"],["oe","o"],["sh","s"],["kh","k"],["th","t"],["ph","f"],["pf","f"]]),Fb=[/([^aeo])h(.)/g,"$1$2",/([aeo])h([^aeo]|$)/g,"$1$2",/(.)\1+/g,"$1"];var Gb={a:"",e:"",i:"",o:"",u:"",y:"",b:1,f:1,p:1,v:1,c:2,g:2,j:2,k:2,q:2,s:2,x:2,z:2,"\u00df":2,d:3,t:3,l:4,m:5,n:5,r:6};var Hb={Exact:Bb,Default:Cb,Normalize:Cb,LatinBalance:{mapper:Db},LatinAdvanced:{mapper:Db,matcher:Eb,replacer:Fb},LatinExtra:{mapper:Db,replacer:Fb.concat([/(?!^)[aeo]/g,""]),matcher:Eb},LatinSoundex:{dedupe:!1,include:{letter:!0},finalize:function(a){for(var b=0;b<a.length;b++){for(var c=a[b],d=c.charAt(0),e=Gb[d],g=1,f;g<c.length&&(f=c.charAt(g),"h"===f||"w"===f||!(f=Gb[f])||f===e||(d+=f,e=f,4!==d.length));g++);a[b]=d}}},CJK:{split:""},LatinExact:Bb,LatinDefault:Cb,LatinSimple:Cb};N.prototype.remove=function(a,b){var c=this.reg.size&&(this.fastupdate?this.reg.get(a):this.reg.has(a));if(c){if(this.fastupdate)for(var d=0,e;d<c.length;d++){if(e=c[d])if(2>e.length)e.pop();else{var g=e.indexOf(a);g===c.length-1?e.pop():e.splice(g,1)}}else Ib(this.map,a),this.depth&&Ib(this.ctx,a);b||this.reg.delete(a)}this.db&&(this.commit_task.push({del:a}),this.ca&&Jb(this));this.cache&&this.cache.remove(a);return this};
 function Ib(a,b){var c=0,d="undefined"===typeof b;if(a.constructor===Array)for(var e=0,g=void 0,f;e<a.length;e++){if((g=a[e])&&g.length)if(d)c++;else if(f=g.indexOf(b),0<=f){1<g.length?(g.splice(f,1),c++):delete a[e];break}else c++}else for(d=x(a.entries()),e=d.next();!e.done;e=d.next())g=e.value,e=g[0],(g=Ib(g[1],b))?c+=g:a.delete(e);return c};var Kb={memory:{resolution:1},performance:{resolution:3,fastupdate:!0,context:{depth:1,resolution:1}},match:{tokenize:"forward"},score:{resolution:9,context:{depth:2,resolution:3}}};N.prototype.add=function(a,b,c,d){if(b&&(a||0===a)){if(!d&&!c&&this.reg.has(a))return this.update(a,b);b=this.encoder.encode(b);if(d=b.length){for(var e=J(),g=J(),f=this.depth,h=this.resolution,k=0;k<d;k++){var l=b[this.rtl?d-1-k:k],m=l.length;if(m&&(f||!g[l])){var n=this.score?this.score(b,l,k,null,0):Lb(h,d,k),p="";switch(this.tokenize){case "full":if(2<m){n=0;for(var q;n<m;n++)for(var r=m;r>n;r--)p=l.substring(n,r),q=this.rtl?m-1-n:n,q=this.score?this.score(b,l,k,p,q):Lb(h,d,k,m,q),Mb(this,g,p,
 q,a,c);break}case "bidirectional":case "reverse":if(1<m){for(r=m-1;0<r;r--)p=l[this.rtl?m-1-r:r]+p,q=this.score?this.score(b,l,k,p,r):Lb(h,d,k,m,r),Mb(this,g,p,q,a,c);p=""}case "forward":if(1<m){for(r=0;r<m;r++)p+=l[this.rtl?m-1-r:r],Mb(this,g,p,n,a,c);break}default:if(Mb(this,g,l,n,a,c),f&&1<d&&k<d-1)for(m=J(),p=this.da,n=l,r=Math.min(f+1,this.rtl?k+1:d-k),q=m[n]=1;q<r;q++)if((l=b[this.rtl?d-1-k-q:k+q])&&!m[l]){m[l]=1;var w=this.score?this.score(b,n,k,l,q-1):Lb(p+(d/2>p?0:1),d,k,r-1,q-1),t=this.bidirectional&&
diff --git a/dist/flexsearch.light.debug.js b/dist/flexsearch.light.debug.js
index 539e3c2..1dcaa6a 100644
--- a/dist/flexsearch.light.debug.js
+++ b/dist/flexsearch.light.debug.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Light/Debug)
+ * FlexSearch.js v0.8.154 (Light/Debug)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
diff --git a/dist/flexsearch.light.min.js b/dist/flexsearch.light.min.js
index 0a71b0d..f0aebcf 100644
--- a/dist/flexsearch.light.min.js
+++ b/dist/flexsearch.light.min.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Light)
+ * FlexSearch.js v0.8.154 (Light)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
diff --git a/dist/flexsearch.light.module.debug.js b/dist/flexsearch.light.module.debug.js
index eb04009..8ab45aa 100644
--- a/dist/flexsearch.light.module.debug.js
+++ b/dist/flexsearch.light.module.debug.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle/Debug)
+ * FlexSearch.js v0.8.154 (Bundle/Debug)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
diff --git a/dist/flexsearch.light.module.min.js b/dist/flexsearch.light.module.min.js
index f25f24b..edfd126 100644
--- a/dist/flexsearch.light.module.min.js
+++ b/dist/flexsearch.light.module.min.js
@@ -1,5 +1,5 @@
 /**!
- * FlexSearch.js v0.8.153 (Bundle)
+ * FlexSearch.js v0.8.154 (Bundle)
  * Author and Copyright: Thomas Wilkerling
  * Licence: Apache-2.0
  * Hosted by Nextapps GmbH
diff --git a/dist/module-debug/cache.js b/dist/module-debug/cache.js
index b62977a..e8ba4af 100644
--- a/dist/module-debug/cache.js
+++ b/dist/module-debug/cache.js
@@ -3,25 +3,25 @@ import Document from "./document.js";
 import { SearchOptions, DocumentSearchOptions } from "./type.js";
 
 /**
- * @param {string|SearchOptions|DocumentSearchOptions} query
- * @param {number|SearchOptions|DocumentSearchOptions=} limit
+ * @param {string|SearchOptions|DocumentSearchOptions} query_or_options
+ * @param {number|SearchOptions|DocumentSearchOptions=} limit_or_options
  * @param {SearchOptions|DocumentSearchOptions=} options
  * @this {Index|Document}
  * @returns {Array<number|string>|Promise}
  */
 
-export function searchCache(query, limit, options) {
+export function searchCache(query_or_options, limit_or_options, options) {
 
-    query = ("object" == typeof query ? "" + query.query : "" + query).toLowerCase();
+    const query = ("object" == typeof query_or_options ? "" + query_or_options.query : "" + query_or_options).toLowerCase();
 
     if (!this.cache) {
         this.cache = new CacheClass();
     }
 
-    //let encoded = this.encoder.encode(query).join(" ");
     let cache = this.cache.get(query);
     if (!cache) {
-        cache = this.search(query, limit, options);
+        cache = this.search(query_or_options, limit_or_options, options);
+
         if (cache.then) {
             const self = this;
             cache.then(function (cache) {
@@ -29,6 +29,7 @@ export function searchCache(query, limit, options) {
                 return cache;
             });
         }
+
         this.cache.set(query, cache);
     }
     return cache;
@@ -50,16 +51,14 @@ export default function CacheClass(limit) {
 
 /**
  * @param {string} key
- * @param value
+ * @param {Array} value
  */
 
 CacheClass.prototype.set = function (key, value) {
-    //if(!this.cache.has(key)){
     this.cache.set(this.last = key, value);
     if (this.cache.size > this.limit) {
         this.cache.delete(this.cache.keys().next().value);
     }
-    //}
 };
 
 /**
diff --git a/dist/module-min/cache.js b/dist/module-min/cache.js
index 83746a8..60577eb 100644
--- a/dist/module-min/cache.js
+++ b/dist/module-min/cache.js
@@ -1 +1 @@
-import Index from"./index.js";import Document from"./document.js";import{SearchOptions,DocumentSearchOptions}from"./type.js";export function searchCache(a,b,c){a=("object"==typeof a?""+a.query:""+a).toLowerCase(),this.cache||(this.cache=new CacheClass);let d=this.cache.get(a);if(!d){if(d=this.search(a,b,c),d.then){const b=this;d.then(function(c){return b.cache.set(a,c),c})}this.cache.set(a,d)}return d}export default function CacheClass(a){this.limit=a&&!0!==a?a:1000,this.cache=new Map,this.last=""}CacheClass.prototype.set=function(a,b){this.cache.set(this.last=a,b),this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)},CacheClass.prototype.get=function(a){const b=this.cache.get(a);return b&&this.last!==a&&(this.cache.delete(a),this.cache.set(this.last=a,b)),b},CacheClass.prototype.remove=function(a){for(const b of this.cache){const c=b[0],d=b[1];d.includes(a)&&this.cache.delete(c)}},CacheClass.prototype.clear=function(){this.cache.clear(),this.last=""};
\ No newline at end of file
+import Index from"./index.js";import Document from"./document.js";import{SearchOptions,DocumentSearchOptions}from"./type.js";export function searchCache(a,b,c){const d=("object"==typeof a?""+a.query:""+a).toLowerCase();this.cache||(this.cache=new CacheClass);let e=this.cache.get(d);if(!e){if(e=this.search(a,b,c),e.then){const a=this;e.then(function(b){return a.cache.set(d,b),b})}this.cache.set(d,e)}return e}export default function CacheClass(a){this.limit=a&&!0!==a?a:1000,this.cache=new Map,this.last=""}CacheClass.prototype.set=function(a,b){this.cache.set(this.last=a,b),this.cache.size>this.limit&&this.cache.delete(this.cache.keys().next().value)},CacheClass.prototype.get=function(a){const b=this.cache.get(a);return b&&this.last!==a&&(this.cache.delete(a),this.cache.set(this.last=a,b)),b},CacheClass.prototype.remove=function(a){for(const b of this.cache){const c=b[0],d=b[1];d.includes(a)&&this.cache.delete(c)}},CacheClass.prototype.clear=function(){this.cache.clear(),this.last=""};
\ No newline at end of file
diff --git a/dist/module/cache.js b/dist/module/cache.js
index b62977a..e8ba4af 100644
--- a/dist/module/cache.js
+++ b/dist/module/cache.js
@@ -3,25 +3,25 @@ import Document from "./document.js";
 import { SearchOptions, DocumentSearchOptions } from "./type.js";
 
 /**
- * @param {string|SearchOptions|DocumentSearchOptions} query
- * @param {number|SearchOptions|DocumentSearchOptions=} limit
+ * @param {string|SearchOptions|DocumentSearchOptions} query_or_options
+ * @param {number|SearchOptions|DocumentSearchOptions=} limit_or_options
  * @param {SearchOptions|DocumentSearchOptions=} options
  * @this {Index|Document}
  * @returns {Array<number|string>|Promise}
  */
 
-export function searchCache(query, limit, options) {
+export function searchCache(query_or_options, limit_or_options, options) {
 
-    query = ("object" == typeof query ? "" + query.query : "" + query).toLowerCase();
+    const query = ("object" == typeof query_or_options ? "" + query_or_options.query : "" + query_or_options).toLowerCase();
 
     if (!this.cache) {
         this.cache = new CacheClass();
     }
 
-    //let encoded = this.encoder.encode(query).join(" ");
     let cache = this.cache.get(query);
     if (!cache) {
-        cache = this.search(query, limit, options);
+        cache = this.search(query_or_options, limit_or_options, options);
+
         if (cache.then) {
             const self = this;
             cache.then(function (cache) {
@@ -29,6 +29,7 @@ export function searchCache(query, limit, options) {
                 return cache;
             });
         }
+
         this.cache.set(query, cache);
     }
     return cache;
@@ -50,16 +51,14 @@ export default function CacheClass(limit) {
 
 /**
  * @param {string} key
- * @param value
+ * @param {Array} value
  */
 
 CacheClass.prototype.set = function (key, value) {
-    //if(!this.cache.has(key)){
     this.cache.set(this.last = key, value);
     if (this.cache.size > this.limit) {
         this.cache.delete(this.cache.keys().next().value);
     }
-    //}
 };
 
 /**
diff --git a/doc/context-index.svg b/doc/context-index.svg
new file mode 100644
index 0000000..f6506f9
--- /dev/null
+++ b/doc/context-index.svg
@@ -0,0 +1,131 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="767px" height="399px"
+     version="1.1">
+    <defs>
+        <linearGradient x1="0%" y1="0%" x2="0%" y2="100%" id="mx-gradient-63f063-1-ffffff-1-s-0">
+            <stop offset="0%" style="stop-color:#74a2ff"/>
+            <stop offset="100%" style="stop-color:#ffffff"/>
+        </linearGradient>
+        <linearGradient x1="0%" y1="100%" x2="0%" y2="0%" id="mx-gradient-ffffff-1-63f063-1-s-0">
+            <stop offset="0%" style="stop-color:#74a2ff"/>
+            <stop offset="100%" style="stop-color:#ffffff"/>
+        </linearGradient>
+    </defs>
+    <g transform="translate(0.5,0.5)">
+        <rect x="231" y="-19" width="71" height="227" fill="url(#mx-gradient-63f063-1-ffffff-1-s-0)" stroke="#4986ff"
+              stroke-dasharray="3 3" transform="rotate(90,266.5,94.5)" pointer-events="none"/>
+        <rect x="465" y="-25" width="71" height="239" fill="url(#mx-gradient-ffffff-1-63f063-1-s-0)" stroke="#4986ff"
+              stroke-dasharray="3 3" transform="rotate(90,500.5,94.5)" pointer-events="none"/>
+        <rect x="343" y="88" width="70" height="13" fill="#74a2ff" stroke="none" transform="rotate(90,378,94.5)"
+              pointer-events="none"/>
+        <g transform="translate(357.5,68.5)">
+            <text x="27" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica" font-weight="bold">Term 4
+            </text>
+        </g>
+        <rect x="240" y="185" width="291" height="58" fill="#4986ff" stroke="#74a2ff" pointer-events="none"/>
+        <g transform="translate(325.5,205.5)">
+            <text x="60" y="16" fill="#FFFFFF" text-anchor="middle" font-size="16px" font-family="Helvetica">Context Index
+            </text>
+        </g>
+        <path d="M 385 135 L 385 178.63" fill="none" stroke="#4986ff" stroke-miterlimit="10" stroke-dasharray="3 3"
+              pointer-events="none"/>
+        <path d="M 385 183.88 L 381.5 176.88 L 385 178.63 L 388.5 176.88 Z" fill="#4986ff" stroke="#4986ff"
+              stroke-miterlimit="10" pointer-events="none"/>
+        <g transform="translate(308.5,26.5)">
+            <text x="77" y="16" fill="#999" text-anchor="middle" font-size="16px" font-family="Helvetica">Context of Relevance
+            </text>
+        </g>
+        <path d="M 385 293 L 385 249.37" fill="none" stroke="#ff7300" stroke-miterlimit="10" stroke-dasharray="3 3"
+              pointer-events="none"/>
+        <path d="M 385 244.12 L 388.5 251.12 L 385 249.37 L 381.5 251.12 Z" fill="#ff7300" stroke="#ff7300"
+              stroke-miterlimit="10" pointer-events="none"/>
+        <ellipse cx="386" cy="333" rx="40" ry="40" fill="#ff7300"
+                 pointer-events="none"/> <!-- stroke="#d6b656" stroke-dasharray="3 3" -->
+        <g transform="translate(363.5,324.5)">
+            <text x="22" y="16" fill="#fff" text-anchor="middle" font-size="16px" font-family="Helvetica">Query
+            </text>
+        </g>
+        <path d="M 388 156 L 461.63 156" fill="none" stroke="#4986ff" stroke-miterlimit="10" stroke-dasharray="3 3"
+              pointer-events="none"/>
+        <path d="M 466.88 156 L 459.88 159.5 L 461.63 156 L 459.88 152.5 Z" fill="#4986ff" stroke="#4986ff"
+              stroke-miterlimit="10" pointer-events="none"/>
+        <g transform="translate(476.5,149.5)">
+            <text x="41" y="10" fill="#74a2ff" text-anchor="middle" font-size="11px" font-family="Helvetica">2. Context Score
+            </text>
+        </g>
+        <path d="M 332 95 L 435.63 95" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3"
+              pointer-events="none"/>
+        <path d="M 440.88 95 L 433.88 98.5 L 435.63 95 L 433.88 91.5 Z" fill="#000000" stroke="#000000"
+              stroke-miterlimit="10" pointer-events="none"/>
+        <g transform="translate(345.5,104.5)">
+            <text x="36" y="11" fill="#000000" text-anchor="middle" font-size="11px" font-family="Helvetica">1. Partial Score
+            </text>
+        </g>
+        <path d="M 379 100 L 379 100" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3"
+              pointer-events="none"/>
+        <path d="M 379 100 L 379 100 L 379 100 L 379 100 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10"
+              pointer-events="none"/>
+        <path d="M 385 87 L 385 87" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3"
+              pointer-events="none"/>
+        <path d="M 385 87 L 385 87 L 385 87 L 385 87 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10"
+              pointer-events="none"/>
+        <path d="M 620 193.5 L 620 142.87" fill="none" stroke="#999" stroke-miterlimit="10"
+              stroke-dasharray="3 3" pointer-events="none"/>
+        <path d="M 620 137.62 L 623.5 144.62 L 620 142.87 L 616.5 144.62 Z" fill="#999"
+              stroke="#999" stroke-opacity="0.3" stroke-miterlimit="10" pointer-events="none"/>
+        <g transform="translate(579.5,204.5)">
+            <text x="41" y="9" fill="#999999" text-anchor="middle" font-size="11px" font-family="Helvetica">Context Limit
+            </text>
+            <text x="41" y="23" fill="#999999" text-anchor="middle" font-size="11px" font-family="Helvetica">(depth)
+            </text>
+        </g>
+        <path d="M 307.37 156 L 381 156" fill="none" stroke="#999999" stroke-miterlimit="10" stroke-dasharray="3 3"
+              pointer-events="none"/>
+        <path d="M 302.12 156 L 309.12 152.5 L 307.37 156 L 309.12 159.5 Z" fill="#999999" stroke="#999999"
+              stroke-miterlimit="10" pointer-events="none"/>
+        <g transform="translate(200.5,149.5)">
+            <text x="48" y="10" fill="#999999" text-anchor="middle" font-size="11px" font-family="Helvetica">3. Document Score
+            </text>
+        </g>
+        <g transform="translate(557.5,344.5)">
+            <text x="65" y="7" fill="#999999" text-anchor="middle" font-size="8px" font-weight="700" font-family="Helvetica">"Model of Context-based Scoring"
+            </text>
+            <text x="71" y="17" fill="#999999" text-anchor="middle" font-size="8px" font-weight="400" font-family="Helvetica">Copyright 2018-2025 Thomas Wilkerling
+            </text>
+            <text x="29.5" y="27" fill="#999999" text-anchor="middle" font-size="8px" font-weight="400" font-family="Helvetica">Nextapps GmbH
+            </text>
+        </g>
+        <g opacity="0.65" transform="translate(167.5,84.5)">
+            <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Term 2
+            </text>
+        </g>
+        <g opacity="0.85" transform="translate(247.5,84.5)">
+            <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Term 3
+            </text>
+        </g>
+        <g opacity="0.85" transform="translate(467.5,84.5)">
+            <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Term 5
+            </text>
+        </g>
+        <g opacity="0.65" transform="translate(547.5,84.5)">
+            <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Term 6
+            </text>
+        </g>
+        <g transform="translate(84.5,84.5)">
+            <text x="26" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">Term 1
+            </text>
+        </g>
+        <g transform="translate(630.5,84.5)">
+            <text x="26" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">Term 7
+            </text>
+        </g>
+        <g transform="translate(699.5,84.5)">
+            <text x="7" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">...
+            </text>
+        </g>
+        <g transform="translate(53.5,84.5)">
+            <text x="7" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">...
+            </text>
+        </g>
+    </g>
+</svg>
diff --git a/doc/contextual-index.svg b/doc/contextual-index.svg
deleted file mode 100644
index 19e4e25..0000000
--- a/doc/contextual-index.svg
+++ /dev/null
@@ -1,339 +0,0 @@
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="767px" height="399px"
-     version="1.1">
-    <defs>
-        <linearGradient x1="0%" y1="0%" x2="0%" y2="100%" id="mx-gradient-63f063-1-ffffff-1-s-0">
-            <stop offset="0%" style="stop-color:#63f063"/>
-            <stop offset="100%" style="stop-color:#ffffff"/>
-        </linearGradient>
-        <linearGradient x1="0%" y1="100%" x2="0%" y2="0%" id="mx-gradient-ffffff-1-63f063-1-s-0">
-            <stop offset="0%" style="stop-color:#63f063"/>
-            <stop offset="100%" style="stop-color:#ffffff"/>
-        </linearGradient>
-    </defs>
-    <g transform="translate(0.5,0.5)">
-        <rect x="231" y="-19" width="71" height="227" fill="url(#mx-gradient-63f063-1-ffffff-1-s-0)" stroke="#009900"
-              stroke-dasharray="3 3" transform="rotate(90,266.5,94.5)" pointer-events="none"/>
-        <rect x="465" y="-25" width="71" height="239" fill="url(#mx-gradient-ffffff-1-63f063-1-s-0)" stroke="#009900"
-              stroke-dasharray="3 3" transform="rotate(90,500.5,94.5)" pointer-events="none"/>
-        <rect x="343" y="88" width="70" height="13" fill="#63f063" stroke="none" transform="rotate(90,378,94.5)"
-              pointer-events="none"/>
-        <g transform="translate(357.5,68.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="54" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 54px; white-space: nowrap; word-wrap: normal; font-weight: bold; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Word 4
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="27" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica"
-                      font-weight="bold">Word 4
-                </text>
-            </switch>
-        </g>
-        <rect x="240" y="185" width="291" height="58" fill="#009900" stroke="#82b366" pointer-events="none"/>
-        <g transform="translate(325.5,205.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="119" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(255, 255, 255); line-height: 1.2; vertical-align: top; width: 121px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">
-                            <div style="text-align: center">
-                                <span>Contextual Index</span>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="60" y="16" fill="#FFFFFF" text-anchor="middle" font-size="16px" font-family="Helvetica">[Not
-                    supported by viewer]
-                </text>
-            </switch>
-        </g>
-        <path d="M 385 135 L 385 178.63" fill="none" stroke="#009900" stroke-miterlimit="10" stroke-dasharray="3 3"
-              pointer-events="none"/>
-        <path d="M 385 183.88 L 381.5 176.88 L 385 178.63 L 388.5 176.88 Z" fill="#009900" stroke="#009900"
-              stroke-miterlimit="10" pointer-events="none"/>
-        <g transform="translate(308.5,26.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="153" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 155px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;color:#999">Context
-                            of Relevance
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="77" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Context
-                    of Relevance
-                </text>
-            </switch>
-        </g>
-        <path d="M 385 293 L 385 249.37" fill="none" stroke="#d79b00" stroke-miterlimit="10" stroke-dasharray="3 3"
-              pointer-events="none"/>
-        <path d="M 385 244.12 L 388.5 251.12 L 385 249.37 L 381.5 251.12 Z" fill="#d79b00" stroke="#d79b00"
-              stroke-miterlimit="10" pointer-events="none"/>
-        <ellipse cx="386" cy="333" rx="40" ry="40" fill="#fff2cc" stroke="#d6b656" stroke-dasharray="3 3"
-                 pointer-events="none"/>
-        <g transform="translate(363.5,324.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="43" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 44px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Query
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="22" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Query
-                </text>
-            </switch>
-        </g>
-        <path d="M 388 156 L 461.63 156" fill="none" stroke="#009900" stroke-miterlimit="10" stroke-dasharray="3 3"
-              pointer-events="none"/>
-        <path d="M 466.88 156 L 459.88 159.5 L 461.63 156 L 459.88 152.5 Z" fill="#009900" stroke="#009900"
-              stroke-miterlimit="10" pointer-events="none"/>
-        <g transform="translate(476.5,149.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="93" height="11"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 153, 0); line-height: 1.2; vertical-align: top; width: 94px; white-space: nowrap; word-wrap: normal;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">2. contextual
-                            score
-                            <br style="font-size: 11px"/>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="47" y="11" fill="#009900" text-anchor="middle" font-size="11px" font-family="Helvetica">[Not
-                    supported by viewer]
-                </text>
-            </switch>
-        </g>
-        <path d="M 332 95 L 435.63 95" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3"
-              pointer-events="none"/>
-        <path d="M 440.88 95 L 433.88 98.5 L 435.63 95 L 433.88 91.5 Z" fill="#000000" stroke="#000000"
-              stroke-miterlimit="10" pointer-events="none"/>
-        <g transform="translate(345.5,104.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="72" height="11"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 73px; white-space: nowrap; word-wrap: normal;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">1. partial score
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="36" y="11" fill="#000000" text-anchor="middle" font-size="11px" font-family="Helvetica">1.
-                    partial score
-                </text>
-            </switch>
-        </g>
-        <path d="M 379 100 L 379 100" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3"
-              pointer-events="none"/>
-        <path d="M 379 100 L 379 100 L 379 100 L 379 100 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10"
-              pointer-events="none"/>
-        <path d="M 385 87 L 385 87" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3"
-              pointer-events="none"/>
-        <path d="M 385 87 L 385 87 L 385 87 L 385 87 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10"
-              pointer-events="none"/>
-        <path d="M 620 193.5 L 620 142.87" fill="none" stroke="#999" stroke-miterlimit="10"
-              stroke-dasharray="3 3" pointer-events="none"/>
-        <path d="M 620 137.62 L 623.5 144.62 L 620 142.87 L 616.5 144.62 Z" fill="#999"
-              stroke="#999" stroke-opacity="0.3" stroke-miterlimit="10" pointer-events="none"/>
-        <g transform="translate(579.5,204.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="81" height="23"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(153, 153, 153); line-height: 1.2; vertical-align: top; width: 81px; white-space: normal; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">context limit
-                            (depth)
-                            <br style="font-size: 11px"/>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="41" y="17" fill="#999999" text-anchor="middle" font-size="11px" font-family="Helvetica">[Not
-                    supported by viewer]
-                </text>
-            </switch>
-        </g>
-        <path d="M 307.37 156 L 381 156" fill="none" stroke="#999999" stroke-miterlimit="10" stroke-dasharray="3 3"
-              pointer-events="none"/>
-        <path d="M 302.12 156 L 309.12 152.5 L 307.37 156 L 309.12 159.5 Z" fill="#999999" stroke="#999999"
-              stroke-miterlimit="10" pointer-events="none"/>
-        <g transform="translate(200.5,149.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="90" height="11"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(153, 153, 153); line-height: 1.2; vertical-align: top; width: 91px; white-space: nowrap; word-wrap: normal;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">3. document score
-                            <br style="font-size: 11px"/>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="45" y="11" fill="#999999" text-anchor="middle" font-size="11px" font-family="Helvetica">[Not
-                    supported by viewer]
-                </text>
-            </switch>
-        </g>
-        <g transform="translate(557.5,344.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="142" height="26"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 8px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 143px; white-space: nowrap; word-wrap: normal;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;color:#999">
-                            <b style="font-size: 8px">"Model of Contextual-based Scoring"</b>
-                            <br style="font-size: 8px"/>Copyright 2018-2021 Thomas Wilkerling<br style="font-size: 8px"/>
-                            Nextapps GmbH
-                            <br style="font-size: 8px"/>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="71" y="17" fill="#000000" text-anchor="middle" font-size="8px" font-family="Helvetica">[Not
-                    supported by viewer]
-                </text>
-            </switch>
-        </g>
-        <g opacity="0.65" transform="translate(167.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="51" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 53px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Word 2
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Word
-                    2
-                </text>
-            </switch>
-        </g>
-        <g opacity="0.85" transform="translate(247.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="51" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 53px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Word 3
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Word
-                    3
-                </text>
-            </switch>
-        </g>
-        <g opacity="0.85" transform="translate(467.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="51" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 53px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Word 5
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Word
-                    5
-                </text>
-            </switch>
-        </g>
-        <g opacity="0.65" transform="translate(547.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="51" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; vertical-align: top; width: 53px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Word 6
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="26" y="16" fill="#000000" text-anchor="middle" font-size="16px" font-family="Helvetica">Word
-                    6
-                </text>
-            </switch>
-        </g>
-        <g transform="translate(84.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="51" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(153, 153, 153); line-height: 1.2; vertical-align: top; width: 53px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Word 1
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="26" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">Word
-                    1
-                </text>
-            </switch>
-        </g>
-        <g transform="translate(630.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="51" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(153, 153, 153); line-height: 1.2; vertical-align: top; width: 53px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">Word 7
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="26" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">Word
-                    7
-                </text>
-            </switch>
-        </g>
-        <g transform="translate(699.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="13" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(153, 153, 153); line-height: 1.2; vertical-align: top; width: 14px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">...
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="7" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">...
-                </text>
-            </switch>
-        </g>
-        <g transform="translate(53.5,84.5)">
-            <switch>
-                <foreignObject style="overflow:visible;" pointer-events="all" width="13" height="16"
-                               requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml"
-                         style="display: inline-block; font-size: 16px; font-family: Helvetica; color: rgb(153, 153, 153); line-height: 1.2; vertical-align: top; width: 14px; white-space: nowrap; word-wrap: normal; text-align: center;">
-                        <div xmlns="http://www.w3.org/1999/xhtml"
-                             style="display:inline-block;text-align:inherit;text-decoration:inherit;">...
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="7" y="16" fill="#999999" text-anchor="middle" font-size="16px" font-family="Helvetica">...
-                </text>
-            </switch>
-        </g>
-    </g>
-</svg>
diff --git a/package-lock.json b/package-lock.json
index d08e1d8..9a285b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "flexsearch",
-  "version": "0.8.153",
+  "version": "0.8.154",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "flexsearch",
-      "version": "0.8.153",
+      "version": "0.8.154",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index 0584eec..aa8da44 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "public": true,
   "preferGlobal": false,
   "name": "flexsearch",
-  "version": "0.8.153",
+  "version": "0.8.154",
   "description": "Next-Generation full-text search library for Browser and Node.js",
   "homepage": "https://github.com/nextapps-de/flexsearch/",
   "author": "Thomas Wilkerling",
diff --git a/src/cache.js b/src/cache.js
index 9be8c08..758f4ff 100644
--- a/src/cache.js
+++ b/src/cache.js
@@ -3,28 +3,28 @@ import Document from "./document.js";
 import { SearchOptions, DocumentSearchOptions } from "./type.js";
 
 /**
- * @param {string|SearchOptions|DocumentSearchOptions} query
- * @param {number|SearchOptions|DocumentSearchOptions=} limit
+ * @param {string|SearchOptions|DocumentSearchOptions} query_or_options
+ * @param {number|SearchOptions|DocumentSearchOptions=} limit_or_options
  * @param {SearchOptions|DocumentSearchOptions=} options
  * @this {Index|Document}
  * @returns {Array<number|string>|Promise}
  */
 
-export function searchCache(query, limit, options){
+export function searchCache(query_or_options, limit_or_options, options){
 
-    query = (typeof query === "object"
-        ? "" + query.query
-        : "" + query
+    const query = (typeof query_or_options === "object"
+        ? "" + query_or_options.query
+        : "" + query_or_options
     ).toLowerCase();
 
     if(!this.cache){
         this.cache = new CacheClass();
     }
 
-    //let encoded = this.encoder.encode(query).join(" ");
     let cache = this.cache.get(query);
     if(!cache){
-        cache = this.search(query, limit, options);
+        cache = this.search(query_or_options, limit_or_options, options);
+
         if(cache.then){
             const self = this;
             cache.then(function(cache){
@@ -32,6 +32,7 @@ export function searchCache(query, limit, options){
                 return cache;
             });
         }
+
         this.cache.set(query, cache);
     }
     return cache;
@@ -53,16 +54,14 @@ export default function CacheClass(limit){
 
 /**
  * @param {string} key
- * @param value
+ * @param {Array} value
  */
 
 CacheClass.prototype.set = function(key, value){
-    //if(!this.cache.has(key)){
-        this.cache.set(this.last = key, value);
-        if(this.cache.size > this.limit){
-            this.cache.delete(this.cache.keys().next().value);
-        }
-    //}
+    this.cache.set(this.last = key, value);
+    if(this.cache.size > this.limit){
+        this.cache.delete(this.cache.keys().next().value);
+    }
 };
 
 /**
diff --git a/test/basic.js b/test/basic.js
index 84acd09..fb94839 100644
--- a/test/basic.js
+++ b/test/basic.js
@@ -32,6 +32,8 @@ describe("Initialize", function(){
         expect(index).to.respondTo("update");
         expect(index).to.respondTo("remove");
         expect(index).to.respondTo("clear");
+        expect(index).to.respondTo("cleanup");
+        expect(index).to.respondTo("contain");
 
         expect(index).to.hasOwnProperty("map");
         expect(index).to.hasOwnProperty("ctx");
@@ -58,7 +60,7 @@ describe("Initialize", function(){
 
     it("Should have the default Encoder", function(){
 
-        const encoder = new Encoder(Charset.LatinDefault);
+        const encoder = new Encoder(Charset.Default);
         expect(index.tokenize).to.equal("strict");
         expect(typeof index.encoder.normalize).to.equal(typeof encoder.normalize);
         index.encoder.normalize = encoder.normalize;
@@ -88,9 +90,9 @@ describe("Add", function(){
         expect(index.reg.size).to.equal(4);
     });
 
-    build_light || it("Should have been numeric content properly added to the index (Triplets)", function(){
+    it("Should have been numeric content properly added to the index (Triplets)", function(){
 
-        const index = new Index();
+        let index = new Index();
 
         index.add(0, "TEST-123456789123456789");
         index.add(1, "T10030");
@@ -101,11 +103,30 @@ describe("Add", function(){
         expect(Array.from(index.map.keys())).to.have.members([
             "test", "123", "456", "789",
             "t", "10", "30",
-            // id 2 was already completely added, split: "t", "100", "30", "t", "100", "30"
+            // id 2 was already completely added, split: "t", "10", "30", "t", "10", "30"
             "14", "3", "ab", "143", "45", "17", "8"
         ]);
         expect(index.ctx.size).to.equal(0);
         expect(index.reg.size).to.equal(4);
+
+        // disabled deduplication
+        index.clear();
+        index.encoder.dedupe = false;
+
+        index.add(0, "TEST-123456789123456789");
+        index.add(1, "T10030");
+        index.add(2, "T10030T10030");
+        index.add(3, "1443-AB14345-1778");
+
+        expect(Array.from(index.reg.keys())).to.have.members([0, 1, 2, 3]);
+        expect(Array.from(index.map.keys())).to.have.members([
+            "test", "123", "456", "789",
+            "t", "100", "30",
+            // id 2 was already completely added, split: "t", "100", "30", "t", "100", "30"
+            "144", "3", "ab", "143", "45", "177", "8"
+        ]);
+        expect(index.ctx.size).to.equal(0);
+        expect(index.reg.size).to.equal(4);
     });
 
     it("Should not have been added to the index (Parameter)", function(){
@@ -316,7 +337,7 @@ describe("Update (Sync)", function(){
 
         const index = new Index({
             fastupdate: true,
-            tokenize: "full"
+            tokenize: "reverse"
         });
         index.add(1, "foo");
         index.add(2, "bar");
@@ -327,43 +348,47 @@ describe("Update (Sync)", function(){
         index.update(3, "foo");
 
         expect(index.reg.size).to.equal(3);
-        expect(index.search("foo")).to.have.members([2, 3]);
-        expect(index.search("bar")).to.have.members([1, 2]);
+        expect(index.search("foo")).to.eql([2, 3]);
+        expect(index.search("bar")).to.eql([1, 2]);
         expect(index.search("bar")).to.not.include(3);
-        expect(index.search("foobar")).to.have.members([2]);
+        expect(index.search("foobar")).to.eql([2]);
 
         index.update(1, "bar");
         index.update(2, "foobar");
         index.update(3, "foo");
+        index.update(4, "new");
 
-        expect(index.reg.size).to.equal(3);
-        expect(index.search("foo")).to.have.members([2, 3]);
-        expect(index.search("bar")).to.have.members([1, 2]);
+        index.update(5, "foo");
+        index.update(5);
+        index.update(6, "foo");
+        index.update(6, null);
+        index.update(7, "foo");
+        index.update(7, false);
+
+        expect(index.reg.size).to.equal(4);
+        expect(index.search("foo")).to.eql([2, 3]);
+        expect(index.search("bar")).to.eql([1, 2]);
         expect(index.search("bar")).to.not.include(3);
-        expect(index.search("foobar")).to.have.members([2]);
+        expect(index.search("foobar")).to.eql([2]);
+        expect(index.search("new")).to.eql([4]);
     });
 
     it("Should not have been updated to the index", function(){
 
-        const index = new Index({ tokenize: "full" });
+        const index = new Index({ tokenize: "bidirectional" });
         index.add(1, "bar");
         index.add(2, "foobar");
         index.add(3, "foo");
 
         index.update("foo");
-        // todo
-        // index.update(1);
         index.update(null, "foobar");
         index.update(void 0, "foobar");
-        // index.update(1, null);
-        // index.update(2, false);
-        index.update(4, "new");
 
-        expect(index.reg.size).to.equal(4);
-        expect(index.search("foo")).to.have.members([2, 3]);
-        expect(index.search("bar")).to.have.members([1, 2]);
+        expect(index.reg.size).to.equal(3);
+        expect(index.search("foo")).to.eql([2, 3]);
+        expect(index.search("bar")).to.eql([1, 2]);
         expect(index.search("bar")).to.not.include(3);
-        expect(index.search("foobar")).to.have.members([2]);
+        expect(index.search("foobar")).to.eql([2]);
     });
 });
 
@@ -373,7 +398,7 @@ describe("Remove (Sync)", function(){
 
         const index = new Index({
             fastupdate: true,
-            tokenize: "full"
+            tokenize: "reverse"
         });
         index.add(1, "bar");
         index.add(2, "foobar");
@@ -425,11 +450,11 @@ describe("Presets", function(){
 
     it("Should have been properly initialized", function(){
 
-        expect(Index("memory").reg.size).to.equal(0);
-        expect(Index("performance").reg.size).to.equal(0);
-        expect(Index("match").reg.size).to.equal(0);
-        expect(Index("score").reg.size).to.equal(0);
-        expect(Index("default").reg.size).to.equal(0);
+        expect(Index("memory").resolution).to.equal(1);
+        expect(Index("performance").resolution).to.equal(3);
+        expect(Index("match").resolution).to.equal(9);
+        expect(Index("score").resolution).to.equal(9);
+        expect(Index("default").resolution).to.equal(9);
     });
 
     it("Should have been properly extended", function(){
diff --git a/test/cache.js b/test/cache.js
index 8405298..ce8a7b9 100644
--- a/test/cache.js
+++ b/test/cache.js
@@ -10,13 +10,13 @@ const build_compact = env && env.includes(".compact");
 const build_esm = !env || env.startsWith("module");
 const Charset = _Charset || (await import("../src/charset.js")).default;
 
-if(!build_light) describe("Caching", function(){
+if(!build_light) describe("Cache", function(){
 
     it("Should have been cached and sorted by popularity/latest", function(){
 
         const index = new Index({
-            cache: 2,
-            tokenize: "reverse"
+            tokenize: "reverse",
+            cache: 2
         });
 
         index.add(0, "foo")
@@ -42,11 +42,26 @@ if(!build_light) describe("Caching", function(){
         expect(index.searchCache("bar")).to.eql([1, 2]);
         expect(Array.from(index.cache.cache.values()).pop()).to.eql([1, 2]);
 
-        // Synchronization
-        // ------------------------------------
+    });
+
+    it("Should have been synchronized properly", function(){
+
+        const index = new Index({
+            tokenize: "reverse",
+            cache: 2
+        });
+
+        index.add(0, "foo")
+             .add(1, "bar")
+             .add(2, "foobar");
+
+        expect(index.searchCache("foo")).to.eql([0, 2]);
+        expect(index.cache.cache.size).to.equal(1);
+
+        expect(index.searchCache("bar")).to.eql([1, 2]);
+        expect(index.cache.cache.size).to.equal(2);
 
         index.remove(2).update(1, "foo").add(3, "foobar");
-
         // 2 was removed
         expect(index.cache.cache.size).to.equal(1);
         // 2 was removed, 3 was added, the cache takes the original reference
diff --git a/test/encoder.js b/test/encoder.js
index 21cea1f..01796e4 100644
--- a/test/encoder.js
+++ b/test/encoder.js
@@ -12,6 +12,18 @@ const Charset = _Charset || (await import("../src/charset.js")).default;
 
 describe("Encoder", function(){
 
+    it("Should have been properly normalized", function(){
+
+        const index = new Index();
+        expect(index.encoder.normalize).to.equal(true);
+
+        index.add(1, "La Bamba");
+        index.add(2, "La Bohème");
+
+        expect(index.search("la boheme")).to.eql([2]);
+        expect(index.search("la boheme", { suggest: true })).to.eql([2, 1]);
+    });
+
     it("Should have been properly added a custom encoder", function(){
 
         const encode = str => str.toLowerCase().split(/\s+/);
