diff --git a/assets/js/search.js b/assets/js/search.js
index 1fe1bd0..a4f2f24 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -16,15 +16,6 @@ const bigramTokeniser = (obj, metadata) => {
     return []
   }
 
-  if (Array.isArray(obj)) {
-    return obj.map((t) => {
-      return new lunr.Token(
-        lunr.utils.asString(t).toLowerCase(),
-        lunr.utils.clone(metadata)
-      )
-    })
-  }
-
   let str = obj.toString().trim().toLowerCase()
   let tokens = []
 
@@ -70,6 +61,7 @@ const initLunr = () => {
       builder.pipeline.reset()
       builder.ref('ref')
       builder.field('title', { boost: 10 })
+      builder.field('tags', { boost: 10 })
       builder.field('body')
       builder.metadataWhitelist = ['position']
       for (let page of pagesIndex) {
diff --git a/layouts/_default/list.json b/layouts/_default/list.json
index 0fa510c..dc748c1 100644
--- a/layouts/_default/list.json
+++ b/layouts/_default/list.json
@@ -3,6 +3,7 @@
         "ref": "{{ $page.Permalink }}",
         "title": {{ $page.Title | jsonify }},
         "section": "{{ $page.Section }}",
+        "tags": {{ $page.Params.tags | jsonify }},
         "date" : {{ $page.Date.Format "2006.01.02" | jsonify }},
         "body": {{ $page.Plain | jsonify }}
     }