diff --git a/README.md b/README.md
index 2d6a788..9baab2c 100644
--- a/README.md
+++ b/README.md
@@ -102,80 +102,80 @@ The **_dist_** folder are located in: `node_modules/flexsearch/dist/`
     </tr>
     <tr>
         <td>flexsearch.bundle.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.bundle.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.bundle.module.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.module.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.module.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.bundle.module.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.module.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.module.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.es5.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.es5.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.es5.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.es5.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.es5.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.es5.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.module.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.module.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.module.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.module.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.module.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.module.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>Javascript Modules (ESM)</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/module/" target="_blank">Download</a></td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/module/" target="_blank">Download</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>Javascript Modules Minified (ESM)</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/module-min/" target="_blank">Download</a></td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-min" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-min</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/module-min/" target="_blank">Download</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-min" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-min</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>Javascript Modules Debug (ESM)</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/module-debug/" target="_blank">Download</a></td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-debug" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-debug</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/module-debug/" target="_blank">Download</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-debug" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-debug</a></td>
     </tr>
     <tr></tr>
     <tr>
@@ -588,7 +588,7 @@ You can also load modules via CDN:
 
 ```html
 <script type="module">
-    import Index from "https://unpkg.com/flexsearch@0.8.0/dist/module/index.js";
+    import Index from "https://unpkg.com/flexsearch@0.8.1/dist/module/index.js";
     const index = new Index(/* ... */);
 </script>
 ```
diff --git a/demo/autocomplete.html b/demo/autocomplete.html
index dfc7007..47a2d46 100644
--- a/demo/autocomplete.html
+++ b/demo/autocomplete.html
@@ -76,8 +76,8 @@
 <div id="suggestions"></div>
 <script type="module">
 
-    import { Document, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js";
-    import data from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/demo/data/movies.js";
+    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";
 
     (function(){
 
diff --git a/dist/flexsearch.bundle.debug.js b/dist/flexsearch.bundle.debug.js
index 06315a5..e8c8358 100644
--- a/dist/flexsearch.bundle.debug.js
+++ b/dist/flexsearch.bundle.debug.js
@@ -1428,7 +1428,6 @@ V.prototype.search = function(a, c, b, e) {
   return k ? Ra(d, c) : r ? Sa(d, a, this.index, this.field, this.D, r) : d;
 };
 function Sa(a, c, b, e, d, f) {
-  console.log("template", f);
   let g, h, k;
   for (let m = 0, n, q, r, p, v; m < a.length; m++) {
     n = a[m].result;
diff --git a/dist/flexsearch.bundle.min.js b/dist/flexsearch.bundle.min.js
index 39423f9..9836b7b 100644
--- a/dist/flexsearch.bundle.min.js
+++ b/dist/flexsearch.bundle.min.js
@@ -55,8 +55,8 @@ Qa.call(this,v[q],v[q+1],b,m,h);d.push({field:v[q],tag:v[q+1],result:p})}return
 q&&(this.db&&(x.tag=q,F=y.db.support_tag_search,x.field=l),F||(x.enrich=!1)),v){v[z]=y.search(a,b,x);x&&h&&(x.enrich=h);continue}else w=y.search(a,b,x),x&&h&&(x.enrich=h);G=w&&(p?w.length:w.result.length);if(q&&G){x=[];y=0;if(this.db&&e){if(!F)for(let H=l.length;H<e.length;H++){let L=e[H];if(L&&L.length)y++,x.push(L);else if(!u)return p?d:new X(d)}}else for(let H=0,L,qb;H<q.length;H+=2){L=this.tag.get(q[H]);if(!L)if(u)continue;else return p?d:new X(d);if(qb=(L=L&&L.get(q[H+1]))&&L.length)y++,x.push(L);
 else if(!u)return p?d:new X(d)}if(y){w=Ha(w,x,p);G=w.length;if(!G&&!u)return p?w:new X(w);y--}}if(G)f[n]=D,d.push(w),n++;else if(1===l.length)return p?d:new X(d)}if(v){if(this.db&&q&&q.length&&!F)for(h=0;h<q.length;h+=2){e=this.index.get(q[h]);if(!e)if(u)continue;else return p?d:new X(d);v.push(e.db.tag(q[h+1],b,m,!1))}const z=this;return Promise.all(v).then(function(w){return w.length?z.search(a,b,c,w):w})}if(!n)return p?d:new X(d);if(g&&(!h||!this.store))return d[0];v=[];for(let z=0,w;z<f.length;z++){w=
 d[z];h&&w.length&&!w[0].doc&&(this.db?v.push(w=this.index.get(this.field[0]).db.enrich(w)):w=W.call(this,w));if(g)return p?w:new X(w);d[z]={field:f[z],result:w}}if(h&&this.db&&v.length){const z=this;return Promise.all(v).then(function(w){for(let D=0;D<w.length;D++)d[D].result=w[D];return k?Ra(d,b):r?Sa(d,a,z.index,z.field,z.D,r):d})}return k?Ra(d,b):r?Sa(d,a,this.index,this.field,this.D,r):d};
-function Sa(a,b,c,e,d,f){console.log("template",f);let g,h,k;for(let m=0,n,p,r,q,u;m<a.length;m++){n=a[m].result;p=a[m].field;q=c.get(p);r=q.encoder;k=q.tokenize;u=d[e.indexOf(p)];r!==g&&(g=r,h=g.encode(b));for(let v=0;v<n.length;v++){let x="";var l=ba(n[v].doc,u);let y=g.encode(l);l=l.split(g.split);for(let F=0,z,w;F<y.length;F++){z=y[F];w=l[F];let D;for(let G=0,C;G<h.length;G++)if(C=h[G],"strict"===k){if(z===C){x+=(x?" ":"")+f.replace("$1",w);D=!0;break}}else{const H=z.indexOf(C);if(-1<H){x+=(x?
-" ":"")+w.substring(0,H)+f.replace("$1",w.substring(H,C.length))+w.substring(H+C.length);D=!0;break}}D||(x+=(x?" ":"")+l[F])}n[v].highlight=x}}return a}function Ra(a,b){const c=[],e=B();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(c.length===b)return c;l.field=e[k]=[f.field];c.push(l)}}return c}
+function Sa(a,b,c,e,d,f){let g,h,k;for(let m=0,n,p,r,q,u;m<a.length;m++){n=a[m].result;p=a[m].field;q=c.get(p);r=q.encoder;k=q.tokenize;u=d[e.indexOf(p)];r!==g&&(g=r,h=g.encode(b));for(let v=0;v<n.length;v++){let x="";var l=ba(n[v].doc,u);let y=g.encode(l);l=l.split(g.split);for(let F=0,z,w;F<y.length;F++){z=y[F];w=l[F];let D;for(let G=0,C;G<h.length;G++)if(C=h[G],"strict"===k){if(z===C){x+=(x?" ":"")+f.replace("$1",w);D=!0;break}}else{const H=z.indexOf(C);if(-1<H){x+=(x?" ":"")+w.substring(0,H)+
+f.replace("$1",w.substring(H,C.length))+w.substring(H+C.length);D=!0;break}}D||(x+=(x?" ":"")+l[F])}n[v].highlight=x}}return a}function Ra(a,b){const c=[],e=B();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(c.length===b)return c;l.field=e[k]=[f.field];c.push(l)}}return c}
 function Qa(a,b,c,e,d){a=this.tag.get(a);if(!a)return[];if((b=(a=a&&a.get(b))&&a.length-e)&&0<b){if(b>c||e)a=a.slice(e,e+c);d&&(a=W.call(this,a));return a}}function W(a){if(!this||!this.store)return a;const b=Array(a.length);for(let c=0,e;c<a.length;c++)e=a[c],b[c]={id:e,doc:this.store.get(e)};return b};function V(a){if(!this||this.constructor!==V)return new V(a);const b=a.document||a.doc||a;let c,e;this.D=[];this.field=[];this.J=[];this.key=(c=b.key||b.id)&&Ta(c,this.J)||"id";(e=a.keystore||0)&&(this.keystore=e);this.fastupdate=!!a.fastupdate;this.reg=!this.fastupdate||a.worker||a.db?e?new U(e):new Set:e?new T(e):new Map;this.C=(c=b.store||null)&&c&&!0!==c&&[];this.store=c&&(e?new T(e):new Map);this.cache=(c=a.cache||null)&&new Y(c);a.cache=!1;this.worker=a.worker;this.priority=a.priority||4;this.index=
 Ua.call(this,a,b);this.tag=null;if(c=b.tag)if("string"===typeof c&&(c=[c]),c.length){this.tag=new Map;this.F=[];this.R=[];for(let d=0,f,g;d<c.length;d++){f=c[d];g=f.field||f;if(!g)throw Error("The tag field from the document descriptor is undefined.");f.custom?this.F[d]=f.custom:(this.F[d]=Ta(g,this.J),f.filter&&("string"===typeof this.F[d]&&(this.F[d]=new String(this.F[d])),this.F[d].I=f.filter));this.R[d]=g;this.tag.set(g,new Map)}}if(this.worker){this.fastupdate=!1;a=[];for(const d of this.index.values())d.then&&
 a.push(d);if(a.length){const d=this;return Promise.all(a).then(function(f){let g=0;for(const h of d.index.entries()){const k=h[0];h[1].then&&d.index.set(k,f[g++])}return d})}}else a.db&&(this.fastupdate=!1,this.mount(a.db))}t=V.prototype;
diff --git a/dist/flexsearch.bundle.module.debug.js b/dist/flexsearch.bundle.module.debug.js
index d2a45b0..f3bf097 100644
--- a/dist/flexsearch.bundle.module.debug.js
+++ b/dist/flexsearch.bundle.module.debug.js
@@ -1427,7 +1427,6 @@ V.prototype.search = function(a, c, b, e) {
   return k ? Ra(d, c) : r ? Sa(d, a, this.index, this.field, this.D, r) : d;
 };
 function Sa(a, c, b, e, d, f) {
-  console.log("template", f);
   let g, h, k;
   for (let m = 0, n, q, r, p, v; m < a.length; m++) {
     n = a[m].result;
diff --git a/dist/flexsearch.bundle.module.min.js b/dist/flexsearch.bundle.module.min.js
index 6058fab..392a7fa 100644
--- a/dist/flexsearch.bundle.module.min.js
+++ b/dist/flexsearch.bundle.module.min.js
@@ -55,8 +55,8 @@ Qa.call(this,v[q],v[q+1],b,m,h);d.push({field:v[q],tag:v[q+1],result:p})}return
 q&&(this.db&&(x.tag=q,F=y.db.support_tag_search,x.field=l),F||(x.enrich=!1)),v){v[z]=y.search(a,b,x);x&&h&&(x.enrich=h);continue}else w=y.search(a,b,x),x&&h&&(x.enrich=h);G=w&&(p?w.length:w.result.length);if(q&&G){x=[];y=0;if(this.db&&e){if(!F)for(let H=l.length;H<e.length;H++){let L=e[H];if(L&&L.length)y++,x.push(L);else if(!u)return p?d:new X(d)}}else for(let H=0,L,nb;H<q.length;H+=2){L=this.tag.get(q[H]);if(!L)if(u)continue;else return p?d:new X(d);if(nb=(L=L&&L.get(q[H+1]))&&L.length)y++,x.push(L);
 else if(!u)return p?d:new X(d)}if(y){w=Ha(w,x,p);G=w.length;if(!G&&!u)return p?w:new X(w);y--}}if(G)f[n]=D,d.push(w),n++;else if(1===l.length)return p?d:new X(d)}if(v){if(this.db&&q&&q.length&&!F)for(h=0;h<q.length;h+=2){e=this.index.get(q[h]);if(!e)if(u)continue;else return p?d:new X(d);v.push(e.db.tag(q[h+1],b,m,!1))}const z=this;return Promise.all(v).then(function(w){return w.length?z.search(a,b,c,w):w})}if(!n)return p?d:new X(d);if(g&&(!h||!this.store))return d[0];v=[];for(let z=0,w;z<f.length;z++){w=
 d[z];h&&w.length&&!w[0].doc&&(this.db?v.push(w=this.index.get(this.field[0]).db.enrich(w)):w=W.call(this,w));if(g)return p?w:new X(w);d[z]={field:f[z],result:w}}if(h&&this.db&&v.length){const z=this;return Promise.all(v).then(function(w){for(let D=0;D<w.length;D++)d[D].result=w[D];return k?Ra(d,b):r?Sa(d,a,z.index,z.field,z.D,r):d})}return k?Ra(d,b):r?Sa(d,a,this.index,this.field,this.D,r):d};
-function Sa(a,b,c,e,d,f){console.log("template",f);let g,h,k;for(let m=0,n,p,r,q,u;m<a.length;m++){n=a[m].result;p=a[m].field;q=c.get(p);r=q.encoder;k=q.tokenize;u=d[e.indexOf(p)];r!==g&&(g=r,h=g.encode(b));for(let v=0;v<n.length;v++){let x="";var l=ba(n[v].doc,u);let y=g.encode(l);l=l.split(g.split);for(let F=0,z,w;F<y.length;F++){z=y[F];w=l[F];let D;for(let G=0,C;G<h.length;G++)if(C=h[G],"strict"===k){if(z===C){x+=(x?" ":"")+f.replace("$1",w);D=!0;break}}else{const H=z.indexOf(C);if(-1<H){x+=(x?
-" ":"")+w.substring(0,H)+f.replace("$1",w.substring(H,C.length))+w.substring(H+C.length);D=!0;break}}D||(x+=(x?" ":"")+l[F])}n[v].highlight=x}}return a}function Ra(a,b){const c=[],e=B();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(c.length===b)return c;l.field=e[k]=[f.field];c.push(l)}}return c}
+function Sa(a,b,c,e,d,f){let g,h,k;for(let m=0,n,p,r,q,u;m<a.length;m++){n=a[m].result;p=a[m].field;q=c.get(p);r=q.encoder;k=q.tokenize;u=d[e.indexOf(p)];r!==g&&(g=r,h=g.encode(b));for(let v=0;v<n.length;v++){let x="";var l=ba(n[v].doc,u);let y=g.encode(l);l=l.split(g.split);for(let F=0,z,w;F<y.length;F++){z=y[F];w=l[F];let D;for(let G=0,C;G<h.length;G++)if(C=h[G],"strict"===k){if(z===C){x+=(x?" ":"")+f.replace("$1",w);D=!0;break}}else{const H=z.indexOf(C);if(-1<H){x+=(x?" ":"")+w.substring(0,H)+
+f.replace("$1",w.substring(H,C.length))+w.substring(H+C.length);D=!0;break}}D||(x+=(x?" ":"")+l[F])}n[v].highlight=x}}return a}function Ra(a,b){const c=[],e=B();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(c.length===b)return c;l.field=e[k]=[f.field];c.push(l)}}return c}
 function Qa(a,b,c,e,d){a=this.tag.get(a);if(!a)return[];if((b=(a=a&&a.get(b))&&a.length-e)&&0<b){if(b>c||e)a=a.slice(e,e+c);d&&(a=W.call(this,a));return a}}function W(a){if(!this||!this.store)return a;const b=Array(a.length);for(let c=0,e;c<a.length;c++)e=a[c],b[c]={id:e,doc:this.store.get(e)};return b};function V(a){if(!this||this.constructor!==V)return new V(a);const b=a.document||a.doc||a;let c,e;this.D=[];this.field=[];this.J=[];this.key=(c=b.key||b.id)&&Ta(c,this.J)||"id";(e=a.keystore||0)&&(this.keystore=e);this.fastupdate=!!a.fastupdate;this.reg=!this.fastupdate||a.worker||a.db?e?new U(e):new Set:e?new T(e):new Map;this.C=(c=b.store||null)&&c&&!0!==c&&[];this.store=c&&(e?new T(e):new Map);this.cache=(c=a.cache||null)&&new Y(c);a.cache=!1;this.worker=a.worker;this.priority=a.priority||4;this.index=
 Ua.call(this,a,b);this.tag=null;if(c=b.tag)if("string"===typeof c&&(c=[c]),c.length){this.tag=new Map;this.F=[];this.R=[];for(let d=0,f,g;d<c.length;d++){f=c[d];g=f.field||f;if(!g)throw Error("The tag field from the document descriptor is undefined.");f.custom?this.F[d]=f.custom:(this.F[d]=Ta(g,this.J),f.filter&&("string"===typeof this.F[d]&&(this.F[d]=new String(this.F[d])),this.F[d].I=f.filter));this.R[d]=g;this.tag.set(g,new Map)}}if(this.worker){this.fastupdate=!1;a=[];for(const d of this.index.values())d.then&&
 a.push(d);if(a.length){const d=this;return Promise.all(a).then(function(f){let g=0;for(const h of d.index.entries()){const k=h[0];h[1].then&&d.index.set(k,f[g++])}return d})}}else a.db&&(this.fastupdate=!1,this.mount(a.db))}t=V.prototype;
diff --git a/dist/flexsearch.compact.debug.js b/dist/flexsearch.compact.debug.js
index e7d68ba..81b7efa 100644
--- a/dist/flexsearch.compact.debug.js
+++ b/dist/flexsearch.compact.debug.js
@@ -1099,7 +1099,6 @@ V.prototype.search = function(a, c, b, e) {
   return h ? Ja(d, c) : q ? Ka(d, a, this.index, this.field, this.C, q) : d;
 };
 function Ka(a, c, b, e, d, f) {
-  console.log("template", f);
   let g, h, k;
   for (let m = 0, n, t, p, q, v; m < a.length; m++) {
     n = a[m].result;
diff --git a/dist/flexsearch.compact.min.js b/dist/flexsearch.compact.min.js
index 6376fe8..e69d495 100644
--- a/dist/flexsearch.compact.min.js
+++ b/dist/flexsearch.compact.min.js
@@ -46,8 +46,8 @@ X.prototype.offset=function(a){if(this.result.length){const c=[];for(let b=0,e;b
 this.db)&&[];for(let y=0,r,E,F;y<l.length;y++){E=l[y];let A;D(E)||(A=E,E=A.field,a=A.query||a,c=A.limit||c,n=A.offset||n,k=A.suggest||k,g=this.store&&(A.enrich||g));if(e)r=e[y];else if(w=A||b,z=this.index.get(E),m&&(w.enrich=!1),u){u[y]=z.search(a,c,w);w&&g&&(w.enrich=g);continue}else r=z.search(a,c,w),w&&g&&(w.enrich=g);F=r&&(p?r.length:r.result.length);if(m&&F){w=[];z=0;for(let J=0,G,Ya;J<m.length;J+=2){G=this.tag.get(m[J]);if(!G)if(k)continue;else return p?d:new X(d);if(Ya=(G=G&&G.get(m[J+1]))&&
 G.length)z++,w.push(G);else if(!k)return p?d:new X(d)}if(z){r=za(r,w);F=r.length;if(!F&&!k)return p?r:new X(r);z--}}if(F)f[t]=E,d.push(r),t++;else if(1===l.length)return p?d:new X(d)}if(u){const y=this;return Promise.all(u).then(function(r){return r.length?y.search(a,c,b,r):r})}if(!t)return p?d:new X(d);if(v&&(!g||!this.store))return d[0];u=[];for(let y=0,r;y<f.length;y++){r=d[y];g&&r.length&&!r[0].doc&&(r=W.call(this,r));if(v)return p?r:new X(r);d[y]={field:f[y],result:r}}return h?Ja(d,c):q?Ka(d,
 a,this.index,this.field,this.C,q):d};
-function Ka(a,c,b,e,d,f){console.log("template",f);let g,h,k;for(let m=0,n,t,p,q,v;m<a.length;m++){n=a[m].result;t=a[m].field;q=b.get(t);p=q.encoder;k=q.tokenize;v=d[e.indexOf(t)];p!==g&&(g=p,h=g.encode(c));for(let u=0;u<n.length;u++){let w="";var l=I(n[u].doc,v);let z=g.encode(l);l=l.split(g.split);for(let y=0,r,E;y<z.length;y++){r=z[y];E=l[y];let F;for(let A=0,J;A<h.length;A++)if(J=h[A],"strict"===k){if(r===J){w+=(w?" ":"")+f.replace("$1",E);F=!0;break}}else{const G=r.indexOf(J);if(-1<G){w+=(w?
-" ":"")+E.substring(0,G)+f.replace("$1",E.substring(G,J.length))+E.substring(G+J.length);F=!0;break}}F||(w+=(w?" ":"")+l[y])}n[u].highlight=w}}return a}function Ja(a,c){const b=[],e=C();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(b.length===c)return b;l.field=e[k]=[f.field];b.push(l)}}return b}
+function Ka(a,c,b,e,d,f){let g,h,k;for(let m=0,n,t,p,q,v;m<a.length;m++){n=a[m].result;t=a[m].field;q=b.get(t);p=q.encoder;k=q.tokenize;v=d[e.indexOf(t)];p!==g&&(g=p,h=g.encode(c));for(let u=0;u<n.length;u++){let w="";var l=I(n[u].doc,v);let z=g.encode(l);l=l.split(g.split);for(let y=0,r,E;y<z.length;y++){r=z[y];E=l[y];let F;for(let A=0,J;A<h.length;A++)if(J=h[A],"strict"===k){if(r===J){w+=(w?" ":"")+f.replace("$1",E);F=!0;break}}else{const G=r.indexOf(J);if(-1<G){w+=(w?" ":"")+E.substring(0,G)+f.replace("$1",
+E.substring(G,J.length))+E.substring(G+J.length);F=!0;break}}F||(w+=(w?" ":"")+l[y])}n[u].highlight=w}}return a}function Ja(a,c){const b=[],e=C();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(b.length===c)return b;l.field=e[k]=[f.field];b.push(l)}}return b}
 function Ia(a,c,b,e,d){a=this.tag.get(a);if(!a)return[];if((c=(a=a&&a.get(c))&&a.length-e)&&0<c){if(c>b||e)a=a.slice(e,e+b);d&&(a=W.call(this,a));return a}}function W(a){if(!this||!this.store)return a;const c=Array(a.length);for(let b=0,e;b<a.length;b++)e=a[b],c[b]={id:e,doc:this.store.get(e)};return c};function V(a){if(!this||this.constructor!==V)return new V(a);const c=a.document||a.doc||a;var b;this.C=[];this.field=[];this.J=[];this.key=(b=c.key||c.id)&&La(b,this.J)||"id";this.reg=(this.fastupdate=!!a.fastupdate)?new Map:new Set;this.A=(b=c.store||null)&&b&&!0!==b&&[];this.store=b&&new Map;this.cache=(b=a.cache||null)&&new Y(b);a.cache=!1;this.priority=a.priority||4;b=new Map;let e=c.index||c.field||c;D(e)&&(e=[e]);for(let d=0,f,g;d<e.length;d++)f=e[d],D(f)||(g=f,f=f.field),g=H(g)?Object.assign({},
 a,g):a,b.set(f,new O(g,this.reg)),g.custom?this.C[d]=g.custom:(this.C[d]=La(f,this.J),g.filter&&("string"===typeof this.C[d]&&(this.C[d]=new String(this.C[d])),this.C[d].I=g.filter)),this.field[d]=f;if(this.A){a=c.store;D(a)&&(a=[a]);for(let d=0,f,g;d<a.length;d++)f=a[d],g=f.field||f,f.custom?(this.A[d]=f.custom,f.custom.U=g):(this.A[d]=La(g,this.J),f.filter&&("string"===typeof this.A[d]&&(this.A[d]=new String(this.A[d])),this.A[d].I=f.filter))}this.index=b;this.tag=null;if(b=c.tag)if("string"===
 typeof b&&(b=[b]),b.length){this.tag=new Map;this.B=[];this.T=[];for(let d=0,f,g;d<b.length;d++){f=b[d];g=f.field||f;if(!g)throw Error("The tag field from the document descriptor is undefined.");f.custom?this.B[d]=f.custom:(this.B[d]=La(g,this.J),f.filter&&("string"===typeof this.B[d]&&(this.B[d]=new String(this.B[d])),this.B[d].I=f.filter));this.T[d]=g;this.tag.set(g,new Map)}}}
diff --git a/dist/flexsearch.compact.module.debug.js b/dist/flexsearch.compact.module.debug.js
index 321583d..2d32c3f 100644
--- a/dist/flexsearch.compact.module.debug.js
+++ b/dist/flexsearch.compact.module.debug.js
@@ -1098,7 +1098,6 @@ V.prototype.search = function(a, c, b, e) {
   return h ? Ja(d, c) : q ? Ka(d, a, this.index, this.field, this.C, q) : d;
 };
 function Ka(a, c, b, e, d, f) {
-  console.log("template", f);
   let g, h, k;
   for (let m = 0, n, t, p, q, v; m < a.length; m++) {
     n = a[m].result;
diff --git a/dist/flexsearch.compact.module.min.js b/dist/flexsearch.compact.module.min.js
index dde4ef3..02ff66f 100644
--- a/dist/flexsearch.compact.module.min.js
+++ b/dist/flexsearch.compact.module.min.js
@@ -46,8 +46,8 @@ X.prototype.offset=function(a){if(this.result.length){const c=[];for(let b=0,e;b
 this.db)&&[];for(let y=0,r,E,F;y<l.length;y++){E=l[y];let A;D(E)||(A=E,E=A.field,a=A.query||a,c=A.limit||c,n=A.offset||n,k=A.suggest||k,g=this.store&&(A.enrich||g));if(e)r=e[y];else if(w=A||b,z=this.index.get(E),m&&(w.enrich=!1),u){u[y]=z.search(a,c,w);w&&g&&(w.enrich=g);continue}else r=z.search(a,c,w),w&&g&&(w.enrich=g);F=r&&(p?r.length:r.result.length);if(m&&F){w=[];z=0;for(let J=0,G,Va;J<m.length;J+=2){G=this.tag.get(m[J]);if(!G)if(k)continue;else return p?d:new X(d);if(Va=(G=G&&G.get(m[J+1]))&&
 G.length)z++,w.push(G);else if(!k)return p?d:new X(d)}if(z){r=za(r,w);F=r.length;if(!F&&!k)return p?r:new X(r);z--}}if(F)f[t]=E,d.push(r),t++;else if(1===l.length)return p?d:new X(d)}if(u){const y=this;return Promise.all(u).then(function(r){return r.length?y.search(a,c,b,r):r})}if(!t)return p?d:new X(d);if(v&&(!g||!this.store))return d[0];u=[];for(let y=0,r;y<f.length;y++){r=d[y];g&&r.length&&!r[0].doc&&(r=W.call(this,r));if(v)return p?r:new X(r);d[y]={field:f[y],result:r}}return h?Ja(d,c):q?Ka(d,
 a,this.index,this.field,this.C,q):d};
-function Ka(a,c,b,e,d,f){console.log("template",f);let g,h,k;for(let m=0,n,t,p,q,v;m<a.length;m++){n=a[m].result;t=a[m].field;q=b.get(t);p=q.encoder;k=q.tokenize;v=d[e.indexOf(t)];p!==g&&(g=p,h=g.encode(c));for(let u=0;u<n.length;u++){let w="";var l=I(n[u].doc,v);let z=g.encode(l);l=l.split(g.split);for(let y=0,r,E;y<z.length;y++){r=z[y];E=l[y];let F;for(let A=0,J;A<h.length;A++)if(J=h[A],"strict"===k){if(r===J){w+=(w?" ":"")+f.replace("$1",E);F=!0;break}}else{const G=r.indexOf(J);if(-1<G){w+=(w?
-" ":"")+E.substring(0,G)+f.replace("$1",E.substring(G,J.length))+E.substring(G+J.length);F=!0;break}}F||(w+=(w?" ":"")+l[y])}n[u].highlight=w}}return a}function Ja(a,c){const b=[],e=C();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(b.length===c)return b;l.field=e[k]=[f.field];b.push(l)}}return b}
+function Ka(a,c,b,e,d,f){let g,h,k;for(let m=0,n,t,p,q,v;m<a.length;m++){n=a[m].result;t=a[m].field;q=b.get(t);p=q.encoder;k=q.tokenize;v=d[e.indexOf(t)];p!==g&&(g=p,h=g.encode(c));for(let u=0;u<n.length;u++){let w="";var l=I(n[u].doc,v);let z=g.encode(l);l=l.split(g.split);for(let y=0,r,E;y<z.length;y++){r=z[y];E=l[y];let F;for(let A=0,J;A<h.length;A++)if(J=h[A],"strict"===k){if(r===J){w+=(w?" ":"")+f.replace("$1",E);F=!0;break}}else{const G=r.indexOf(J);if(-1<G){w+=(w?" ":"")+E.substring(0,G)+f.replace("$1",
+E.substring(G,J.length))+E.substring(G+J.length);F=!0;break}}F||(w+=(w?" ":"")+l[y])}n[u].highlight=w}}return a}function Ja(a,c){const b=[],e=C();for(let d=0,f,g;d<a.length;d++){f=a[d];g=f.result;for(let h=0,k,l,m;h<g.length;h++)if(l=g[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=e[k])m.push(f.field);else{if(b.length===c)return b;l.field=e[k]=[f.field];b.push(l)}}return b}
 function Ia(a,c,b,e,d){a=this.tag.get(a);if(!a)return[];if((c=(a=a&&a.get(c))&&a.length-e)&&0<c){if(c>b||e)a=a.slice(e,e+b);d&&(a=W.call(this,a));return a}}function W(a){if(!this||!this.store)return a;const c=Array(a.length);for(let b=0,e;b<a.length;b++)e=a[b],c[b]={id:e,doc:this.store.get(e)};return c};function V(a){if(!this||this.constructor!==V)return new V(a);const c=a.document||a.doc||a;var b;this.C=[];this.field=[];this.J=[];this.key=(b=c.key||c.id)&&La(b,this.J)||"id";this.reg=(this.fastupdate=!!a.fastupdate)?new Map:new Set;this.A=(b=c.store||null)&&b&&!0!==b&&[];this.store=b&&new Map;this.cache=(b=a.cache||null)&&new Y(b);a.cache=!1;this.priority=a.priority||4;b=new Map;let e=c.index||c.field||c;D(e)&&(e=[e]);for(let d=0,f,g;d<e.length;d++)f=e[d],D(f)||(g=f,f=f.field),g=H(g)?Object.assign({},
 a,g):a,b.set(f,new O(g,this.reg)),g.custom?this.C[d]=g.custom:(this.C[d]=La(f,this.J),g.filter&&("string"===typeof this.C[d]&&(this.C[d]=new String(this.C[d])),this.C[d].I=g.filter)),this.field[d]=f;if(this.A){a=c.store;D(a)&&(a=[a]);for(let d=0,f,g;d<a.length;d++)f=a[d],g=f.field||f,f.custom?(this.A[d]=f.custom,f.custom.U=g):(this.A[d]=La(g,this.J),f.filter&&("string"===typeof this.A[d]&&(this.A[d]=new String(this.A[d])),this.A[d].I=f.filter))}this.index=b;this.tag=null;if(b=c.tag)if("string"===
 typeof b&&(b=[b]),b.length){this.tag=new Map;this.B=[];this.T=[];for(let d=0,f,g;d<b.length;d++){f=b[d];g=f.field||f;if(!g)throw Error("The tag field from the document descriptor is undefined.");f.custom?this.B[d]=f.custom:(this.B[d]=La(g,this.J),f.filter&&("string"===typeof this.B[d]&&(this.B[d]=new String(this.B[d])),this.B[d].I=f.filter));this.T[d]=g;this.tag.set(g,new Map)}}}
diff --git a/dist/flexsearch.es5.debug.js b/dist/flexsearch.es5.debug.js
index abe0755..6360a30 100644
--- a/dist/flexsearch.es5.debug.js
+++ b/dist/flexsearch.es5.debug.js
@@ -2338,7 +2338,6 @@ W.prototype.search = function(a, b, c, d) {
   return m ? vb(e, b) : t ? wb(e, a, this.index, this.field, this.J, t) : e;
 };
 function wb(a, b, c, d, e, g) {
-  console.log("template", g);
   for (var f, h, k, l = 0, m, n, p; l < a.length; l++) {
     for (m = a[l].result, n = a[l].field, k = c.get(n), p = k.encoder, k = k.tokenize, n = e[d.indexOf(n)], p !== f && (f = p, h = f.encode(b)), p = 0; p < m.length; p++) {
       var q = "", t = ya(m[p].doc, n), w = f.encode(t);
diff --git a/dist/flexsearch.es5.min.js b/dist/flexsearch.es5.min.js
index 9e0748c..1b64643 100644
--- a/dist/flexsearch.es5.min.js
+++ b/dist/flexsearch.es5.min.js
@@ -90,8 +90,8 @@ ub.call(this,t[g],t[g+1],b,w,f);e.push({field:t[g],tag:t[g+1],result:l})}return
 p;var Ja=v.db.support_tag_search;y.field=n}Ja||(y.enrich=!1)}if(t){t[A]=v.search(a,b,y);y&&f&&(y.enrich=f);continue}else v=v.search(a,b,y),y&&f&&(y.enrich=f)}y=v&&(k?v.length:v.result.length);if(p&&y){D=[];G=0;if(this.db&&d){if(!Ja)for(I=n.length;I<d.length;I++){var M=d[I];if(M&&M.length)G++,D.push(M);else if(!q)return k?e:new Y(e)}}else{I=0;for(var Wb=M=void 0;I<p.length;I+=2){M=this.tag.get(p[I]);if(!M)if(q)continue;else return k?e:new Y(e);if(Wb=(M=M&&M.get(p[I+1]))&&M.length)G++,D.push(M);else if(!q)return k?
 e:new Y(e)}}if(G){v=lb(v,D,k);y=v.length;if(!y&&!q)return k?v:new Y(v);G--}}if(y)g[h]=z,e.push(v),h++;else if(1===n.length)return k?e:new Y(e)}if(t){if(this.db&&p&&p.length&&!Ja)for(f=0;f<p.length;f+=2){g=this.index.get(p[f]);if(!g)if(q)continue;else return k?e:new Y(e);t.push(g.db.tag(p[f+1],b,w,!1))}var Xb=this;return Promise.all(t).then(function(P){return P.length?Xb.search(a,b,c,P):P})}if(!h)return k?e:new Y(e);if(l&&(!f||!this.store))return e[0];t=[];w=0;for(q=void 0;w<g.length;w++){q=e[w];f&&
 q.length&&!q[0].doc&&(this.db?t.push(q=this.index.get(this.field[0]).db.enrich(q)):q=X.call(this,q));if(l)return k?q:new Y(q);e[w]={field:g[w],result:q}}if(f&&this.db&&t.length){var Ka=this;return Promise.all(t).then(function(P){for(var Q=0;Q<P.length;Q++)e[Q].result=P[Q];return m?vb(e,b):r?wb(e,a,Ka.index,Ka.field,Ka.J,r):e})}return m?vb(e,b):r?wb(e,a,this.index,this.field,this.J,r):e};
-function wb(a,b,c,d,e,g){console.log("template",g);for(var f,h,k,l=0,m,n,p;l<a.length;l++)for(m=a[l].result,n=a[l].field,k=c.get(n),p=k.encoder,k=k.tokenize,n=e[d.indexOf(n)],p!==f&&(f=p,h=f.encode(b)),p=0;p<m.length;p++){var q="",r=ya(m[p].doc,n),w=f.encode(r);r=r.split(f.split);for(var t=0,A,z;t<w.length;t++){A=w[t];z=r[t];for(var v=void 0,y=0,D;y<h.length;y++)if(D=h[y],"strict"===k){if(A===D){q+=(q?" ":"")+g.replace("$1",z);v=!0;break}}else{var G=A.indexOf(D);if(-1<G){q+=(q?" ":"")+z.substring(0,
-G)+g.replace("$1",z.substring(G,D.length))+z.substring(G+D.length);v=!0;break}}v||(q+=(q?" ":"")+r[t])}m[p].highlight=q}return a}function vb(a,b){for(var c=[],d=J(),e=0,g,f;e<a.length;e++){g=a[e];f=g.result;for(var h=0,k,l,m;h<f.length;h++)if(l=f[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=d[k])m.push(g.field);else{if(c.length===b)return c;l.field=d[k]=[g.field];c.push(l)}}return c}
+function wb(a,b,c,d,e,g){for(var f,h,k,l=0,m,n,p;l<a.length;l++)for(m=a[l].result,n=a[l].field,k=c.get(n),p=k.encoder,k=k.tokenize,n=e[d.indexOf(n)],p!==f&&(f=p,h=f.encode(b)),p=0;p<m.length;p++){var q="",r=ya(m[p].doc,n),w=f.encode(r);r=r.split(f.split);for(var t=0,A,z;t<w.length;t++){A=w[t];z=r[t];for(var v=void 0,y=0,D;y<h.length;y++)if(D=h[y],"strict"===k){if(A===D){q+=(q?" ":"")+g.replace("$1",z);v=!0;break}}else{var G=A.indexOf(D);if(-1<G){q+=(q?" ":"")+z.substring(0,G)+g.replace("$1",z.substring(G,
+D.length))+z.substring(G+D.length);v=!0;break}}v||(q+=(q?" ":"")+r[t])}m[p].highlight=q}return a}function vb(a,b){for(var c=[],d=J(),e=0,g,f;e<a.length;e++){g=a[e];f=g.result;for(var h=0,k,l,m;h<f.length;h++)if(l=f[h],"object"!==typeof l&&(l={id:l}),k=l.id,m=d[k])m.push(g.field);else{if(c.length===b)return c;l.field=d[k]=[g.field];c.push(l)}}return c}
 function ub(a,b,c,d,e){a=this.tag.get(a);if(!a)return[];if((b=(a=a&&a.get(b))&&a.length-d)&&0<b){if(b>c||d)a=a.slice(d,d+c);e&&(a=X.call(this,a));return a}}function X(a){if(!this||!this.store)return a;for(var b=Array(a.length),c=0,d;c<a.length;c++)d=a[c],b[c]={id:d,doc:this.store.get(d)};return b};function W(a){if(!this||this.constructor!==W)return new W(a);var b=a.document||a.doc||a,c,d;this.J=[];this.field=[];this.S=[];this.key=(c=b.key||b.id)&&xb(c,this.S)||"id";(d=a.keystore||0)&&(this.keystore=d);this.fastupdate=!!a.fastupdate;this.reg=!this.fastupdate||a.worker||a.db?d?new V(d):new Set:d?new U(d):new Map;this.I=(c=b.store||null)&&c&&!0!==c&&[];this.store=c&&(d?new U(d):new Map);this.cache=(c=a.cache||null)&&new Z(c);a.cache=!1;this.worker=a.worker;this.priority=a.priority||4;this.index=
 yb.call(this,a,b);this.tag=null;if(c=b.tag)if("string"===typeof c&&(c=[c]),c.length){this.tag=new Map;this.L=[];this.aa=[];b=0;for(var e=d=void 0;b<c.length;b++){d=c[b];e=d.field||d;if(!e)throw Error("The tag field from the document descriptor is undefined.");d.custom?this.L[b]=d.custom:(this.L[b]=xb(e,this.S),d.filter&&("string"===typeof this.L[b]&&(this.L[b]=new String(this.L[b])),this.L[b].R=d.filter));this.aa[b]=e;this.tag.set(e,new Map)}}if(this.worker){this.fastupdate=!1;a=[];c=x(this.index.values());
 for(b=c.next();!b.done;b=c.next())b=b.value,b.then&&a.push(b);if(a.length){var g=this;return Promise.all(a).then(function(f){for(var h=0,k=x(g.index.entries()),l=k.next();!l.done;l=k.next()){l=l.value;var m=l[0];l[1].then&&g.index.set(m,f[h++])}return g})}}else a.db&&(this.fastupdate=!1,this.mount(a.db))}u=W.prototype;
diff --git a/dist/module-debug/document/search.js b/dist/module-debug/document/search.js
index d6f02b8..84eb916 100644
--- a/dist/module-debug/document/search.js
+++ b/dist/module-debug/document/search.js
@@ -438,7 +438,7 @@ function highlight_fields(result, query, index, field, tree, template) {
     // if(typeof template === "string"){
     //     template = new RegExp(template, "g");
     // }
-    console.log("template", template);
+    //console.log("template", template)
     let encoder, query_enc, tokenize;
 
 
diff --git a/dist/module-debug/keystore.js b/dist/module-debug/keystore.js
index 10a837e..40cbd39 100644
--- a/dist/module-debug/keystore.js
+++ b/dist/module-debug/keystore.js
@@ -132,8 +132,7 @@ export function KeystoreArray(arr) {
                     return function (key) {
                         for (let i = 0; i < self.index.length; i++) {
                             if (self.index[i].includes(key)) {
-                                return (/* tag? */ /* stringify */ /* stringify */ /* single param */ /* skip update: */ /* append: */
-                                    /* skip update: */ /* skip_update: */ /* skip deletion */
+                                return (/* tag? */ /* stringify */ /* stringify */ /* single param */ /* skip update: */ /* append: */ /* skip update: */ /* skip_update: */ /* skip deletion */
                                     // splice:
                                     !0 /*await rows.hasNext()*/ /*await rows.hasNext()*/ /*await rows.hasNext()*/
                                 );
@@ -197,7 +196,7 @@ function Keystore() {
     this.refs;
     /** @type {number} */
     this.size;
-    /** @type {function((string|number)):number} */
+    /** @type {function((string|bigint|number)):number} */
     this.crc;
     /** @type {bigint|number} */
     this.bit;
@@ -206,7 +205,7 @@ function Keystore() {
 /**
  * @param bitlength
  * @constructor
- * @implements {Keystore}
+ * @implements Keystore
  */
 
 export function KeystoreMap(bitlength = 8) {
@@ -223,7 +222,6 @@ export function KeystoreMap(bitlength = 8) {
     this.size = 0;
 
     if (32 < bitlength) {
-        /** @type {function((string|number)):number} */
         this.crc = lcg64;
         this.bit = BigInt(bitlength);
     } else {
@@ -232,6 +230,7 @@ export function KeystoreMap(bitlength = 8) {
     }
 }
 
+/** @param {number|string} key */
 KeystoreMap.prototype.get = function (key) {
     const address = this.crc(key),
           map = this.index[address];
@@ -239,6 +238,10 @@ KeystoreMap.prototype.get = function (key) {
     return map && map.get(key);
 };
 
+/**
+ * @param {number|string} key
+ * @param {*} value
+ */
 KeystoreMap.prototype.set = function (key, value) {
     const address = this.crc(key);
     let map = this.index[address];
@@ -257,7 +260,7 @@ KeystoreMap.prototype.set = function (key, value) {
 /**
  * @param bitlength
  * @constructor
- * @implements {Keystore}
+ * @implements Keystore
  */
 
 export function KeystoreSet(bitlength = 8) {
@@ -274,7 +277,6 @@ export function KeystoreSet(bitlength = 8) {
     this.size = 0;
 
     if (32 < bitlength) {
-        /** @type {function((string|number)):number} */
         this.crc = lcg64;
         this.bit = BigInt(bitlength);
     } else {
@@ -283,6 +285,7 @@ export function KeystoreSet(bitlength = 8) {
     }
 }
 
+/** @param {number|string} key */
 KeystoreSet.prototype.add = function (key) {
     const address = this.crc(key);
     let set = this.index[address];
@@ -298,7 +301,9 @@ KeystoreSet.prototype.add = function (key) {
     }
 };
 
-KeystoreMap.prototype.has = KeystoreSet.prototype.has = function (key) {
+KeystoreMap.prototype.has =
+/** @param {number|string} key */
+KeystoreSet.prototype.has = function (key) {
     const address = this.crc(key),
           map_or_set = this.index[address];
 
@@ -317,7 +322,9 @@ KeystoreSet.prototype.size = function(){
 };
 */
 
-KeystoreMap.prototype.delete = KeystoreSet.prototype.delete = function (key) {
+KeystoreMap.prototype.delete =
+/** @param {number|string} key */
+KeystoreSet.prototype.delete = function (key) {
     const address = this.crc(key),
           map_or_set = this.index[address];
 
@@ -340,6 +347,9 @@ KeystoreMap.prototype.clear = KeystoreSet.prototype.clear = function () {
 //     this.proxy = null;
 // };
 
+/**
+ * @return Iterable
+ */
 KeystoreMap.prototype.values = KeystoreSet.prototype.values = function* () {
     // alternatively iterate through this.keys[]
     //const refs = Object.values(this.index);
@@ -350,6 +360,9 @@ KeystoreMap.prototype.values = KeystoreSet.prototype.values = function* () {
     }
 };
 
+/**
+ * @return Iterable
+ */
 KeystoreMap.prototype.keys = KeystoreSet.prototype.keys = function* () {
     //const values = Object.values(this.index);
     for (let i = 0; i < this.refs.length; i++) {
@@ -359,6 +372,9 @@ KeystoreMap.prototype.keys = KeystoreSet.prototype.keys = function* () {
     }
 };
 
+/**
+ * @return Iterable
+ */
 KeystoreMap.prototype.entries = KeystoreSet.prototype.entries = function* () {
     //const values = Object.values(this.index);
     for (let i = 0; i < this.refs.length; i++) {
@@ -370,7 +386,7 @@ KeystoreMap.prototype.entries = KeystoreSet.prototype.entries = function* () {
 
 /**
  * Linear Congruential Generator (LCG)
- * @param str
+ * @param {!number|bigint|string} str
  * @this {KeystoreMap|KeystoreSet}
  */
 
@@ -390,23 +406,23 @@ function lcg(str) {
 }
 
 /**
- * @param str
+ * @param {!number|bigint|string} str
  * @this {KeystoreMap|KeystoreSet}
  */
 
 function lcg64(str) {
-    let range = BigInt(2) ** /** @type {!BigInt} */this.bit - BigInt(1),
+    let range = BigInt(2) ** /** @type {!bigint} */this.bit - BigInt(1),
         type = typeof str;
 
     if ("bigint" == type) {
-        return (/** @type {!BigInt} */str & range
+        return (/** @type {!bigint} */str & range
         );
     }
     if ("number" == type) {
         return BigInt(str) & range;
     }
     let crc = BigInt(0),
-        bit = /** @type {!BigInt} */this.bit + BigInt(1);
+        bit = /** @type {!bigint} */this.bit + BigInt(1);
     for (let i = 0; i < str.length; i++) {
         crc = (crc * bit ^ BigInt(str.charCodeAt(i))) & range;
     }
diff --git a/dist/module-min/document/search.js b/dist/module-min/document/search.js
index c8d0a18..fc963ef 100644
--- a/dist/module-min/document/search.js
+++ b/dist/module-min/document/search.js
@@ -1 +1 @@
-import{DocumentSearchOptions,DocumentSearchResults,EnrichedDocumentSearchResults,MergedDocumentSearchResults,MergedDocumentSearchEntry,EnrichedSearchResults,SearchResults,IntermediateSearchResults}from"../type.js";import{create_object,is_array,is_object,is_string,parse_simple}from"../common.js";import{intersect_union}from"../intersect.js";import Document from"../document.js";import Index from"../index.js";import Resolver from"../resolver.js";import tick from"../profiler.js";Document.prototype.search=function(a,b,c,d){!1,c||(!b&&is_object(a)?(c=a,a=""):is_object(b)&&(c=b,b=0));let e,f,g,h,j,k,l,m,n=[],o=[],p=0,q=!0;if(c){if(is_array(c)&&(c={index:c}),a=c.query||a,e=c.pluck,g=c.merge,j=e||c.field||(j=c.index)&&(j.index?null:j),k=this.tag&&c.tag,h=c.suggest,q=!1!==c.resolve,(q||e||(j=j||this.field,j&&(is_string(j)?e=j:(is_array(j)&&1===j.length&&(j=j[0]),e=j.field||j.index))),!1,f=this.store&&c.enrich&&q,m=f&&c.highlight,b=c.limit||b,l=c.offset||0,b||(b=100),k&&(!this.db||!d))){!1,k.constructor!==Array&&(k=[k]);let c=[];for(let a,b=0;b<k.length;b++)if(a=k[b],a.field&&a.tag){const b=a.tag;if(b.constructor===Array)for(let d=0;d<b.length;d++)c.push(a.field,b[d]);else c.push(a.field,b)}else{const b=Object.keys(a);for(let d,e,f=0;f<b.length;f++)if(d=b[f],e=a[d],e.constructor===Array)for(let a=0;a<e.length;a++)c.push(d,e[a]);else c.push(d,e)}if(k=c,!a){let a=[];if(c.length)for(let d=0;d<c.length;d+=2){let e;if(this.db){const g=this.index.get(c[d]);if(!g){continue}!1,a.push(e=g.db.tag(c[d+1],b,l,f))}else!1,e=get_tag.call(this,c[d],c[d+1],b,l,f);n.push({field:c[d],tag:c[d+1],result:e})}return a.length?Promise.all(a).then(function(a){for(let b=0;b<a.length;b++)n[b].result=a[b];return n}):n}}j&&j.constructor!==Array&&(j=[j])}j||(j=this.field);let r,s=!d&&(this.worker||this.db)&&[];for(let e,g,m,t=0;t<j.length;t++){if(g=j[t],this.db&&this.tag&&!this.tree[t])continue;let i;if(is_string(g)||(i=g,g=i.field,a=i.query||a,b=i.limit||b,l=i.offset||l,h=i.suggest||h,f=this.store&&(i.enrich||f)),d)e=d[t];else{let d=i||c,h=this.index.get(g);if(k&&(this.db&&(d.tag=k,r=h.db.support_tag_search,d.field=j),!r&&(d.enrich=!1)),s){s[t]=h.search(a,b,d),d&&f&&(d.enrich=f);continue}else e=h.search(a,b,d),d&&f&&(d.enrich=f)}if(m=e&&(q?e.length:e.result.length),k&&m){const a=[];let b=0;if(!(this.db&&d))for(let c,d,e=0;e<k.length;e+=2){if(!1,c=this.tag.get(k[e]),!c)if(!1,h)continue;else return q?n:new Resolver(n);if(c=c&&c.get(k[e+1]),d=c&&c.length,d)b++,a.push(c);else if(!h)return q?n:new Resolver(n)}else if(!r)for(let c=j.length;c<d.length;c++){let e=d[c],f=e&&e.length;if(f)b++,a.push(e);else if(!h)return q?n:new Resolver(n)}if(b){if(!1,e=intersect_union(e,a,q),m=e.length,!m&&!h)return q?e:new Resolver(e);b--}}if(m)o[p]=g,n.push(e),p++;else if(1===j.length)return q?n:new Resolver(n)}if(s){if(this.db&&k&&k.length&&!r)for(let a=0;a<k.length;a+=2){const c=this.index.get(k[a]);if(!c)if(!1,h)continue;else return q?n:new Resolver(n);!1,s.push(c.db.tag(k[a+1],b,l,!1))}const d=this;return Promise.all(s).then(function(e){return e.length?d.search(a,b,c,e):e})}if(!p)return q?n:new Resolver(n);if(e&&(!f||!this.store))return n[0];s=[];for(let g,h=0;h<o.length;h++){if(g=n[h],f&&g.length&&!g[0].doc&&(this.db?(!1,s.push(g=this.index.get(this.field[0]).db.enrich(g))):g=apply_enrich.call(this,g)),e)return q?g:new Resolver(g);n[h]={field:o[h],result:g}}if(f&&!0&&this.db&&s.length){const c=this;return Promise.all(s).then(function(d){for(let a=0;a<d.length;a++)n[a].result=d[a];return g?merge_fields(n,b,l):m?highlight_fields(n,a,c.index,c.field,c.tree,m,b,l):n})}return g?merge_fields(n,b,l):m?highlight_fields(n,a,this.index,this.field,this.tree,m,b,l):n};function highlight_fields(a,b,c,d,e,f){console.log("template",f);let g,h,j;for(let k,l,m,n,o,p=0;p<a.length;p++){k=a[p].result,l=a[p].field,n=c.get(l),m=n.encoder,j=n.tokenize,o=e[d.indexOf(l)],m!==g&&(g=m,h=g.encode(b));for(let a=0;a<k.length;a++){let b="",c=parse_simple(k[a].doc,o),d=g.encode(c),e=c.split(g.split);for(let a,c,g=0;g<d.length;g++){a=d[g],c=e[g];let i;for(let d,e=0;e<h.length;e++)if(d=h[e],"strict"!==j){const e=a.indexOf(d);if(-1<e){b+=(b?" ":"")+c.substring(0,e)+f.replace("$1",c.substring(e,d.length))+c.substring(e+d.length),i=!0;break}}else if(a===d){b+=(b?" ":"")+f.replace("$1",c),i=!0;break}i||(b+=(b?" ":"")+e[g])}k[a].highlight=b}}return a}function merge_fields(a,b){const c=[],d=create_object();for(let e,f,g=0;g<a.length;g++){e=a[g],f=e.result;for(let a,g,h,i=0;i<f.length;i++)if(g=f[i],"object"!=typeof g&&(g={id:g}),a=g.id,h=d[a],!h){if(c.length===b)return c;g.field=d[a]=[e.field],c.push(g)}else h.push(e.field)}return c}function get_tag(a,b,c,d){let e=this.tag.get(a);if(!e)return!1,[];e=e&&e.get(b);e&&e.length-d}export function apply_enrich(a){if(!this||!this.store)return a;const b=Array(a.length);for(let c,d=0;d<a.length;d++)c=a[d],b[d]={id:c,doc:this.store.get(c)};return b}
\ No newline at end of file
+import{DocumentSearchOptions,DocumentSearchResults,EnrichedDocumentSearchResults,MergedDocumentSearchResults,MergedDocumentSearchEntry,EnrichedSearchResults,SearchResults,IntermediateSearchResults}from"../type.js";import{create_object,is_array,is_object,is_string,parse_simple}from"../common.js";import{intersect_union}from"../intersect.js";import Document from"../document.js";import Index from"../index.js";import Resolver from"../resolver.js";import tick from"../profiler.js";Document.prototype.search=function(a,b,c,d){!1,c||(!b&&is_object(a)?(c=a,a=""):is_object(b)&&(c=b,b=0));let e,f,g,h,j,k,l,m,n=[],o=[],p=0,q=!0;if(c){if(is_array(c)&&(c={index:c}),a=c.query||a,e=c.pluck,g=c.merge,j=e||c.field||(j=c.index)&&(j.index?null:j),k=this.tag&&c.tag,h=c.suggest,q=!1!==c.resolve,(q||e||(j=j||this.field,j&&(is_string(j)?e=j:(is_array(j)&&1===j.length&&(j=j[0]),e=j.field||j.index))),!1,f=this.store&&c.enrich&&q,m=f&&c.highlight,b=c.limit||b,l=c.offset||0,b||(b=100),k&&(!this.db||!d))){!1,k.constructor!==Array&&(k=[k]);let c=[];for(let a,b=0;b<k.length;b++)if(a=k[b],a.field&&a.tag){const b=a.tag;if(b.constructor===Array)for(let d=0;d<b.length;d++)c.push(a.field,b[d]);else c.push(a.field,b)}else{const b=Object.keys(a);for(let d,e,f=0;f<b.length;f++)if(d=b[f],e=a[d],e.constructor===Array)for(let a=0;a<e.length;a++)c.push(d,e[a]);else c.push(d,e)}if(k=c,!a){let a=[];if(c.length)for(let d=0;d<c.length;d+=2){let e;if(this.db){const g=this.index.get(c[d]);if(!g){continue}!1,a.push(e=g.db.tag(c[d+1],b,l,f))}else!1,e=get_tag.call(this,c[d],c[d+1],b,l,f);n.push({field:c[d],tag:c[d+1],result:e})}return a.length?Promise.all(a).then(function(a){for(let b=0;b<a.length;b++)n[b].result=a[b];return n}):n}}j&&j.constructor!==Array&&(j=[j])}j||(j=this.field);let r,s=!d&&(this.worker||this.db)&&[];for(let e,g,m,t=0;t<j.length;t++){if(g=j[t],this.db&&this.tag&&!this.tree[t])continue;let i;if(is_string(g)||(i=g,g=i.field,a=i.query||a,b=i.limit||b,l=i.offset||l,h=i.suggest||h,f=this.store&&(i.enrich||f)),d)e=d[t];else{let d=i||c,h=this.index.get(g);if(k&&(this.db&&(d.tag=k,r=h.db.support_tag_search,d.field=j),!r&&(d.enrich=!1)),s){s[t]=h.search(a,b,d),d&&f&&(d.enrich=f);continue}else e=h.search(a,b,d),d&&f&&(d.enrich=f)}if(m=e&&(q?e.length:e.result.length),k&&m){const a=[];let b=0;if(!(this.db&&d))for(let c,d,e=0;e<k.length;e+=2){if(!1,c=this.tag.get(k[e]),!c)if(!1,h)continue;else return q?n:new Resolver(n);if(c=c&&c.get(k[e+1]),d=c&&c.length,d)b++,a.push(c);else if(!h)return q?n:new Resolver(n)}else if(!r)for(let c=j.length;c<d.length;c++){let e=d[c],f=e&&e.length;if(f)b++,a.push(e);else if(!h)return q?n:new Resolver(n)}if(b){if(!1,e=intersect_union(e,a,q),m=e.length,!m&&!h)return q?e:new Resolver(e);b--}}if(m)o[p]=g,n.push(e),p++;else if(1===j.length)return q?n:new Resolver(n)}if(s){if(this.db&&k&&k.length&&!r)for(let a=0;a<k.length;a+=2){const c=this.index.get(k[a]);if(!c)if(!1,h)continue;else return q?n:new Resolver(n);!1,s.push(c.db.tag(k[a+1],b,l,!1))}const d=this;return Promise.all(s).then(function(e){return e.length?d.search(a,b,c,e):e})}if(!p)return q?n:new Resolver(n);if(e&&(!f||!this.store))return n[0];s=[];for(let g,h=0;h<o.length;h++){if(g=n[h],f&&g.length&&!g[0].doc&&(this.db?(!1,s.push(g=this.index.get(this.field[0]).db.enrich(g))):g=apply_enrich.call(this,g)),e)return q?g:new Resolver(g);n[h]={field:o[h],result:g}}if(f&&!0&&this.db&&s.length){const c=this;return Promise.all(s).then(function(d){for(let a=0;a<d.length;a++)n[a].result=d[a];return g?merge_fields(n,b,l):m?highlight_fields(n,a,c.index,c.field,c.tree,m,b,l):n})}return g?merge_fields(n,b,l):m?highlight_fields(n,a,this.index,this.field,this.tree,m,b,l):n};function highlight_fields(a,b,c,d,e,f){let g,h,j;for(let k,l,m,n,o,p=0;p<a.length;p++){k=a[p].result,l=a[p].field,n=c.get(l),m=n.encoder,j=n.tokenize,o=e[d.indexOf(l)],m!==g&&(g=m,h=g.encode(b));for(let a=0;a<k.length;a++){let b="",c=parse_simple(k[a].doc,o),d=g.encode(c),e=c.split(g.split);for(let a,c,g=0;g<d.length;g++){a=d[g],c=e[g];let i;for(let d,e=0;e<h.length;e++)if(d=h[e],"strict"!==j){const e=a.indexOf(d);if(-1<e){b+=(b?" ":"")+c.substring(0,e)+f.replace("$1",c.substring(e,d.length))+c.substring(e+d.length),i=!0;break}}else if(a===d){b+=(b?" ":"")+f.replace("$1",c),i=!0;break}i||(b+=(b?" ":"")+e[g])}k[a].highlight=b}}return a}function merge_fields(a,b){const c=[],d=create_object();for(let e,f,g=0;g<a.length;g++){e=a[g],f=e.result;for(let a,g,h,i=0;i<f.length;i++)if(g=f[i],"object"!=typeof g&&(g={id:g}),a=g.id,h=d[a],!h){if(c.length===b)return c;g.field=d[a]=[e.field],c.push(g)}else h.push(e.field)}return c}function get_tag(a,b,c,d){let e=this.tag.get(a);if(!e)return!1,[];e=e&&e.get(b);e&&e.length-d}export function apply_enrich(a){if(!this||!this.store)return a;const b=Array(a.length);for(let c,d=0;d<a.length;d++)c=a[d],b[d]={id:c,doc:this.store.get(c)};return b}
\ No newline at end of file
diff --git a/dist/module/document/search.js b/dist/module/document/search.js
index 4afaf52..c02a35b 100644
--- a/dist/module/document/search.js
+++ b/dist/module/document/search.js
@@ -418,7 +418,7 @@ function highlight_fields(result, query, index, field, tree, template) {
     // if(typeof template === "string"){
     //     template = new RegExp(template, "g");
     // }
-    console.log("template", template);
+    //console.log("template", template)
     let encoder, query_enc, tokenize;
 
 
diff --git a/dist/module/keystore.js b/dist/module/keystore.js
index 10a837e..40cbd39 100644
--- a/dist/module/keystore.js
+++ b/dist/module/keystore.js
@@ -132,8 +132,7 @@ export function KeystoreArray(arr) {
                     return function (key) {
                         for (let i = 0; i < self.index.length; i++) {
                             if (self.index[i].includes(key)) {
-                                return (/* tag? */ /* stringify */ /* stringify */ /* single param */ /* skip update: */ /* append: */
-                                    /* skip update: */ /* skip_update: */ /* skip deletion */
+                                return (/* tag? */ /* stringify */ /* stringify */ /* single param */ /* skip update: */ /* append: */ /* skip update: */ /* skip_update: */ /* skip deletion */
                                     // splice:
                                     !0 /*await rows.hasNext()*/ /*await rows.hasNext()*/ /*await rows.hasNext()*/
                                 );
@@ -197,7 +196,7 @@ function Keystore() {
     this.refs;
     /** @type {number} */
     this.size;
-    /** @type {function((string|number)):number} */
+    /** @type {function((string|bigint|number)):number} */
     this.crc;
     /** @type {bigint|number} */
     this.bit;
@@ -206,7 +205,7 @@ function Keystore() {
 /**
  * @param bitlength
  * @constructor
- * @implements {Keystore}
+ * @implements Keystore
  */
 
 export function KeystoreMap(bitlength = 8) {
@@ -223,7 +222,6 @@ export function KeystoreMap(bitlength = 8) {
     this.size = 0;
 
     if (32 < bitlength) {
-        /** @type {function((string|number)):number} */
         this.crc = lcg64;
         this.bit = BigInt(bitlength);
     } else {
@@ -232,6 +230,7 @@ export function KeystoreMap(bitlength = 8) {
     }
 }
 
+/** @param {number|string} key */
 KeystoreMap.prototype.get = function (key) {
     const address = this.crc(key),
           map = this.index[address];
@@ -239,6 +238,10 @@ KeystoreMap.prototype.get = function (key) {
     return map && map.get(key);
 };
 
+/**
+ * @param {number|string} key
+ * @param {*} value
+ */
 KeystoreMap.prototype.set = function (key, value) {
     const address = this.crc(key);
     let map = this.index[address];
@@ -257,7 +260,7 @@ KeystoreMap.prototype.set = function (key, value) {
 /**
  * @param bitlength
  * @constructor
- * @implements {Keystore}
+ * @implements Keystore
  */
 
 export function KeystoreSet(bitlength = 8) {
@@ -274,7 +277,6 @@ export function KeystoreSet(bitlength = 8) {
     this.size = 0;
 
     if (32 < bitlength) {
-        /** @type {function((string|number)):number} */
         this.crc = lcg64;
         this.bit = BigInt(bitlength);
     } else {
@@ -283,6 +285,7 @@ export function KeystoreSet(bitlength = 8) {
     }
 }
 
+/** @param {number|string} key */
 KeystoreSet.prototype.add = function (key) {
     const address = this.crc(key);
     let set = this.index[address];
@@ -298,7 +301,9 @@ KeystoreSet.prototype.add = function (key) {
     }
 };
 
-KeystoreMap.prototype.has = KeystoreSet.prototype.has = function (key) {
+KeystoreMap.prototype.has =
+/** @param {number|string} key */
+KeystoreSet.prototype.has = function (key) {
     const address = this.crc(key),
           map_or_set = this.index[address];
 
@@ -317,7 +322,9 @@ KeystoreSet.prototype.size = function(){
 };
 */
 
-KeystoreMap.prototype.delete = KeystoreSet.prototype.delete = function (key) {
+KeystoreMap.prototype.delete =
+/** @param {number|string} key */
+KeystoreSet.prototype.delete = function (key) {
     const address = this.crc(key),
           map_or_set = this.index[address];
 
@@ -340,6 +347,9 @@ KeystoreMap.prototype.clear = KeystoreSet.prototype.clear = function () {
 //     this.proxy = null;
 // };
 
+/**
+ * @return Iterable
+ */
 KeystoreMap.prototype.values = KeystoreSet.prototype.values = function* () {
     // alternatively iterate through this.keys[]
     //const refs = Object.values(this.index);
@@ -350,6 +360,9 @@ KeystoreMap.prototype.values = KeystoreSet.prototype.values = function* () {
     }
 };
 
+/**
+ * @return Iterable
+ */
 KeystoreMap.prototype.keys = KeystoreSet.prototype.keys = function* () {
     //const values = Object.values(this.index);
     for (let i = 0; i < this.refs.length; i++) {
@@ -359,6 +372,9 @@ KeystoreMap.prototype.keys = KeystoreSet.prototype.keys = function* () {
     }
 };
 
+/**
+ * @return Iterable
+ */
 KeystoreMap.prototype.entries = KeystoreSet.prototype.entries = function* () {
     //const values = Object.values(this.index);
     for (let i = 0; i < this.refs.length; i++) {
@@ -370,7 +386,7 @@ KeystoreMap.prototype.entries = KeystoreSet.prototype.entries = function* () {
 
 /**
  * Linear Congruential Generator (LCG)
- * @param str
+ * @param {!number|bigint|string} str
  * @this {KeystoreMap|KeystoreSet}
  */
 
@@ -390,23 +406,23 @@ function lcg(str) {
 }
 
 /**
- * @param str
+ * @param {!number|bigint|string} str
  * @this {KeystoreMap|KeystoreSet}
  */
 
 function lcg64(str) {
-    let range = BigInt(2) ** /** @type {!BigInt} */this.bit - BigInt(1),
+    let range = BigInt(2) ** /** @type {!bigint} */this.bit - BigInt(1),
         type = typeof str;
 
     if ("bigint" == type) {
-        return (/** @type {!BigInt} */str & range
+        return (/** @type {!bigint} */str & range
         );
     }
     if ("number" == type) {
         return BigInt(str) & range;
     }
     let crc = BigInt(0),
-        bit = /** @type {!BigInt} */this.bit + BigInt(1);
+        bit = /** @type {!bigint} */this.bit + BigInt(1);
     for (let i = 0; i < str.length; i++) {
         crc = (crc * bit ^ BigInt(str.charCodeAt(i))) & range;
     }
diff --git a/doc/0.8.0.md b/doc/0.8.0.md
index e9c2241..a28dfd3 100644
--- a/doc/0.8.0.md
+++ b/doc/0.8.0.md
@@ -1380,80 +1380,80 @@ The **_dist_** folder are located in: `node_modules/flexsearch/dist/`
     </tr>
     <tr>
         <td>flexsearch.bundle.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.bundle.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.bundle.module.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.module.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.module.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.bundle.module.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.bundle.module.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.bundle.module.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.es5.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.es5.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.es5.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.es5.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.es5.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.es5.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.es5.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.es5.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.module.debug.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.module.debug.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.debug.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.module.debug.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.debug.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.debug.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>flexsearch.light.module.min.js</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/flexsearch.light.module.min.js" target="_blank">Download</a></td>
-        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.min.js</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/flexsearch.light.module.min.js" target="_blank">Download</a></td>
+        <td><a href="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.min.js" target="_blank">https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.min.js</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>Javascript Modules (ESM)</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/module/" target="_blank">Download</a></td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/module/" target="_blank">Download</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>Javascript Modules Minified (ESM)</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/module-min/" target="_blank">Download</a></td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-min" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-min</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/module-min/" target="_blank">Download</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-min" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-min</a></td>
     </tr>
     <tr></tr>
     <tr>
         <td>Javascript Modules Debug (ESM)</td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.0/dist/module-debug/" target="_blank">Download</a></td>
-        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-debug" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.0/dist/module-debug</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/raw/0.8.1/dist/module-debug/" target="_blank">Download</a></td>
+        <td><a href="https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-debug" target="_blank">https://github.com/nextapps-de/flexsearch/tree/0.8.1/dist/module-debug</a></td>
     </tr>
     <tr></tr>
     <tr>
@@ -1573,7 +1573,7 @@ You can also load modules via CDN:
 
 ```html
 <script type="module">
-    import Index from "https://unpkg.com/flexsearch@0.8.0/dist/module/index.js";
+    import Index from "https://unpkg.com/flexsearch@0.8.1/dist/module/index.js";
     const index = new Index(/* ... */);
 </script>
 ```
diff --git a/example/browser-legacy/basic-persistent/index.html b/example/browser-legacy/basic-persistent/index.html
index ec5e5cf..1526ea1 100644
--- a/example/browser-legacy/basic-persistent/index.html
+++ b/example/browser-legacy/basic-persistent/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-persistent</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/basic-resolver/index.html b/example/browser-legacy/basic-resolver/index.html
index 634c954..4924fca 100644
--- a/example/browser-legacy/basic-resolver/index.html
+++ b/example/browser-legacy/basic-resolver/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-resolver</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js"></script>
 <script>
 
   // create a simple index which can store id-content-pairs
diff --git a/example/browser-legacy/basic-suggestion/index.html b/example/browser-legacy/basic-suggestion/index.html
index 9b5d2e0..1492980 100644
--- a/example/browser-legacy/basic-suggestion/index.html
+++ b/example/browser-legacy/basic-suggestion/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-suggestion</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.min.js"></script>
 <script>
 
   // create a simple index which can store id-content-pairs
diff --git a/example/browser-legacy/basic-worker/index.html b/example/browser-legacy/basic-worker/index.html
index 5f4af70..ba875ae 100644
--- a/example/browser-legacy/basic-worker/index.html
+++ b/example/browser-legacy/basic-worker/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-basic-worker</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/document-highlighting/index.html b/example/browser-legacy/document-highlighting/index.html
index 2c433e3..b44dc82 100644
--- a/example/browser-legacy/document-highlighting/index.html
+++ b/example/browser-legacy/document-highlighting/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document-highlighting</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.compact.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.compact.min.js"></script>
 <script type="module">
 
   // some test data
diff --git a/example/browser-legacy/document-persistent/index.html b/example/browser-legacy/document-persistent/index.html
index a71bbf7..9c3b451 100644
--- a/example/browser-legacy/document-persistent/index.html
+++ b/example/browser-legacy/document-persistent/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document-persistent</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/document-worker/index.html b/example/browser-legacy/document-worker/index.html
index eba3e5d..2d0efb7 100644
--- a/example/browser-legacy/document-worker/index.html
+++ b/example/browser-legacy/document-worker/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document-worker</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.min.js"></script>
 <script>
 (async function(){
 
diff --git a/example/browser-legacy/document/index.html b/example/browser-legacy/document/index.html
index 648a92f..d0fada6 100644
--- a/example/browser-legacy/document/index.html
+++ b/example/browser-legacy/document/index.html
@@ -6,7 +6,7 @@
   <title>Example: browser-legacy-document</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.compact.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.compact.min.js"></script>
 <script>
 
   // some test data
diff --git a/example/browser-legacy/language-pack/index.html b/example/browser-legacy/language-pack/index.html
index 0769cd7..a05e41a 100644
--- a/example/browser-legacy/language-pack/index.html
+++ b/example/browser-legacy/language-pack/index.html
@@ -6,9 +6,9 @@
   <title>Example: browser-legacy-language-packs</title>
 </head>
 <body style="white-space: pre">
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.compact.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.compact.min.js"></script>
 <!-- Load language pack after loading the library -->
-<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/lang/en.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/lang/en.min.js"></script>
 <script>
 
   const encoder = new FlexSearch.Encoder(
diff --git a/example/browser-module/basic-persistent/index.html b/example/browser-module/basic-persistent/index.html
index 407fd31..3ca92cc 100644
--- a/example/browser-module/basic-persistent/index.html
+++ b/example/browser-module/basic-persistent/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index, IndexedDB } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js";
+  import { Index, IndexedDB } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js";
 
   // create DB instance with namespace
   const db = new IndexedDB("my-store");
diff --git a/example/browser-module/basic-resolver/index.html b/example/browser-module/basic-resolver/index.html
index 25083b6..cd12e5a 100644
--- a/example/browser-module/basic-resolver/index.html
+++ b/example/browser-module/basic-resolver/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index, Resolver } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js";
+  import { Index, Resolver } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js";
 
   // create a simple index which can store id-content-pairs
   const index = new Index({
diff --git a/example/browser-module/basic-suggestion/index.html b/example/browser-module/basic-suggestion/index.html
index 52597b8..19596ac 100644
--- a/example/browser-module/basic-suggestion/index.html
+++ b/example/browser-module/basic-suggestion/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.min.js";
+  import { Index } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.min.js";
 
   // create a simple index which can store id-content-pairs
   const index = new Index({
diff --git a/example/browser-module/basic-worker-extern-config/config.js b/example/browser-module/basic-worker-extern-config/config.js
index bec6b9f..28f815a 100644
--- a/example/browser-module/basic-worker-extern-config/config.js
+++ b/example/browser-module/basic-worker-extern-config/config.js
@@ -1,4 +1,4 @@
-import { Encoder } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js";
+import { Encoder } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js";
 
 export default {
     tokenize: "forward",
diff --git a/example/browser-module/basic/index.html b/example/browser-module/basic/index.html
index c61ea1e..83f351a 100644
--- a/example/browser-module/basic/index.html
+++ b/example/browser-module/basic/index.html
@@ -8,7 +8,10 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.light.module.min.js";
+  //import { Index } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.light.module.min.js";
+  import Index from "../../../src/index.js";
+  import Resolver from "../../../src/resolver.js";
+  import Encoder from "../../../src/encoder.js";
 
   // create a simple index which can store id-content-pairs
   const index = new Index({
@@ -19,8 +22,9 @@
 
   // some test data
   const data = [
+    'rats',
     'cats abcd efgh ijkl mnop qrst uvwx cute',
-    'cats abcd efgh ijkl mnop qrst cute',
+    'cats abcd efgh ijkl mnop dogs cute',
     'cats abcd efgh ijkl mnop cute',
     'cats abcd efgh ijkl cute',
     'cats abcd efgh cute',
@@ -33,12 +37,51 @@
     index.add(id, item);
   });
 
-  // perform query
-  index.search("cute cat").forEach(i => {
+  // console.log(index.encoder)
+  // console.log(index.encoder.encode("cute"))
+
+  // let test = Encoder({}, {}, {});
+  // console.log(test)
+
+  new Resolver({
+    index: index,
+    query: "dog"
+  })
+  .boost(2)
+  .or({
+    index: index,
+    query: "cut",
+    suggest: true,
+    limit: 10,
+    offset: 0,
+    resolve: true
+  })
+
+  // .not({
+  //   index: index,
+  //   query: "mnop",
+  //
+  // })
+  // .xor({
+  //   index: index,
+  //   query: "rats",
+  //   limit: 10,
+  //   offset: 0,
+  //   enrich: true,
+  //   resolve: true
+  // })
+
+  .forEach(i => {
     const result = data[i];
     log(result);
   });
 
+  // // perform query
+  // index.search("cute dog", { suggest: true }).forEach(i => {
+  //   const result = data[i];
+  //   log(result);
+  // });
+
   function log(str){
     document.body.appendChild(
       document.createTextNode(str + "\n")
diff --git a/example/browser-module/document-highlighting/index.html b/example/browser-module/document-highlighting/index.html
index 7c52ce7..25f242a 100644
--- a/example/browser-module/document-highlighting/index.html
+++ b/example/browser-module/document-highlighting/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Document, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.compact.module.min.js";
+  import { Document, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.compact.module.min.js";
 
   // some test data
   const data = [{
diff --git a/example/browser-module/document-persistent/index.html b/example/browser-module/document-persistent/index.html
index b9b8999..90d1f78 100644
--- a/example/browser-module/document-persistent/index.html
+++ b/example/browser-module/document-persistent/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Document, Charset, IndexedDB } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js";
+  import { Document, Charset, IndexedDB } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js";
 
   // some test data
   const data = [{
diff --git a/example/browser-module/document-worker-extern-config/config.originalTitle.js b/example/browser-module/document-worker-extern-config/config.originalTitle.js
index 9747eb1..3451a16 100644
--- a/example/browser-module/document-worker-extern-config/config.originalTitle.js
+++ b/example/browser-module/document-worker-extern-config/config.originalTitle.js
@@ -1,5 +1,5 @@
-import { Encoder, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js";
-import EnglishPreset from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/module/lang/en.js";
+import { Encoder, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js";
+import EnglishPreset from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/module/lang/en.js";
 
 export default {
     tokenize: "forward",
diff --git a/example/browser-module/document-worker-extern-config/config.primaryTitle.js b/example/browser-module/document-worker-extern-config/config.primaryTitle.js
index 9747eb1..3451a16 100644
--- a/example/browser-module/document-worker-extern-config/config.primaryTitle.js
+++ b/example/browser-module/document-worker-extern-config/config.primaryTitle.js
@@ -1,5 +1,5 @@
-import { Encoder, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.bundle.module.min.js";
-import EnglishPreset from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/module/lang/en.js";
+import { Encoder, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.bundle.module.min.js";
+import EnglishPreset from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/module/lang/en.js";
 
 export default {
     tokenize: "forward",
diff --git a/example/browser-module/document/index.html b/example/browser-module/document/index.html
index f6af16e..f06ff63 100644
--- a/example/browser-module/document/index.html
+++ b/example/browser-module/document/index.html
@@ -8,7 +8,7 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Document, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.compact.module.min.js";
+  import { Document, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.compact.module.min.js";
 
   // some test data
   const data = [{
diff --git a/example/browser-module/language-pack/index.html b/example/browser-module/language-pack/index.html
index 3b5744e..3df2337 100644
--- a/example/browser-module/language-pack/index.html
+++ b/example/browser-module/language-pack/index.html
@@ -8,8 +8,8 @@
 <body style="white-space: pre">
 <script type="module">
 
-  import { Index, Encoder, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/flexsearch.compact.module.min.js";
-  import EnglishPreset from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.0/dist/module/lang/en.js";
+  import { Index, Encoder, Charset } from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/flexsearch.compact.module.min.js";
+  import EnglishPreset from "https://cdn.jsdelivr.net/gh/nextapps-de/flexsearch@0.8.1/dist/module/lang/en.js";
 
   const encoder = new Encoder(
     Charset.LatinSimple,
diff --git a/src/document/search.js b/src/document/search.js
index 52b2dc9..70e0bb4 100644
--- a/src/document/search.js
+++ b/src/document/search.js
@@ -500,7 +500,7 @@ function highlight_fields(result, query, index, field, tree, template, limit, of
     // if(typeof template === "string"){
     //     template = new RegExp(template, "g");
     // }
-    console.log("template", template)
+    //console.log("template", template)
     let encoder;
     let query_enc;
     let tokenize;