diff --git a/elastic/index.js b/elastic/index.js
index f895c83..684614c 100644
--- a/elastic/index.js
+++ b/elastic/index.js
@@ -1,11 +1,12 @@
 const events = require('events');
 const elasticsearch = require('elasticsearch');
-
-const eventEmitter = new events.EventEmitter();
 const promisify = require('promisify-event');
 const { log } = require('../utils');
+const { normaliser } = require('./normaliser');
+
 const { ELASTIC_AUTH, ELASTIC_HOST } = process.env;
 const logger = log('elastic');
+const eventEmitter = new events.EventEmitter();
 let connected = false;
 
 const client = new elasticsearch.Client({
@@ -42,8 +43,9 @@ function singleInsert({ index, type, document, id }) {
 }
 
 function bulkInsert({ index, type, documents }) {
+  const normalisedDocs = normaliser(index, documents);
   const insert = { index:  { _index: index, _type: type } };
-  const request = documents.reduce((acc, current) => {
+  const request = normalisedDocs.reduce((acc, current) => {
     return [
       ...acc,
       {...insert, index: { ...insert.index, _id: current.id } },
@@ -117,8 +119,19 @@ function findTheThings(query) {
   const searchQuery = {
     body: {
       query: {
-        match: {
-          _all: query
+        fuzzy: {
+          friendlySearchString: {
+            value: query,
+            fuzziness: 1
+          }
+        }
+      },
+      highlight : {
+        force_source: true,
+        fragment_size: 150,
+        tags_schema: 'styled',
+        fields : {
+          friendlySearchString: { pre_tags : ['<em class="fcc_resultHighlight">'], post_tags : ['</em>'] }
         }
       }
     }
@@ -131,6 +144,7 @@ function findTheThings(query) {
         reject(err);
         return;
       }
+      console.info(response.hits.hits[1]);
       resolve(response.hits.hits);
     });
   });
diff --git a/elastic/normaliser.js b/elastic/normaliser.js
new file mode 100644
index 0000000..e2e298a
--- /dev/null
+++ b/elastic/normaliser.js
@@ -0,0 +1,58 @@
+const articleMetaRE = /^\-\-\-[\w\W]+?\-\-\-/;
+const mdImageRE = /!\[[\w\W]*?\]\([\w\W]+?\)/;
+const titleRE = /^#[^\n]*$/gm;
+const htmlTagsRE = /(<([^>]+)>)/gi;
+
+function formatExMdownFile(description) {
+  return description
+      .replace(articleMetaRE, '')
+      .replace(htmlTagsRE, '')
+      .replace(mdImageRE, '')
+      .replace(titleRE, '');
+}
+
+function challengeNormaliser(doc) {
+  return {
+    ...doc,
+    friendlySearchString: doc.description.replace(htmlTagsRE, '')
+  };
+}
+
+function newsNormaliser(doc) {
+  return {
+    ...doc,
+    friendlySearchString: formatExMdownFile(doc.content),
+    title: doc.data.title
+  };
+}
+
+function guideNormaliser(doc) {
+  return {
+    ...doc,
+    friendlySearchString: formatExMdownFile(doc.body),
+    url: `https://guide.freecodecamp.org${doc.url}`
+  };
+}
+
+function youtubeNormaliser(doc) {
+  return {
+    ...doc,
+    friendlySearchString: doc.description
+  };
+}
+
+const normaliserMap = {
+  challenge: challengeNormaliser,
+  news: newsNormaliser,
+  guides: guideNormaliser,
+  youtube: youtubeNormaliser
+};
+
+exports.normaliser = function normaliser(index, docs) {
+  return docs.map(doc => {
+    if (!(index in normaliserMap)) {
+      throw new Error('No normalising function found for %s', index);
+    }
+    return normaliserMap[index](doc);
+  });
+};