diff --git a/app/static/js/nopaque.CorpusAnalysisClient.js b/app/static/js/nopaque.CorpusAnalysisClient.js
index 60e57369..268ba048 100644
--- a/app/static/js/nopaque.CorpusAnalysisClient.js
+++ b/app/static/js/nopaque.CorpusAnalysisClient.js
@@ -5,7 +5,7 @@ class CorpusAnalysisClient {
     this.displays = {};
     this.socket = socket;
 
-    // socket on event fpr corpous analysis initialization
+    // socket on event for corpous analysis initialization
     socket.on("corpus_analysis_init", (response) => {
       var errorText;
 
@@ -20,7 +20,8 @@ class CorpusAnalysisClient {
       } else {
         errorText = `Error ${response.code} - ${response.msg}`;
         if (this.displays.init.errorContainer != undefined)  {
-          this.displays.init.errorContainer.innerHTML = `<p class="red-text"><i class="material-icons tiny">error</i> ${errorText}</p>`;
+          this.displays.init.errorContainer.innerHTML = `<p class="red-text">` +
+                   `<i class="material-icons tiny">error</i> ${errorText}</p>`;
         }
         if (this.displays.init != undefined)  {
           this.displays.init.setVisibilityByStatus("error");
@@ -45,7 +46,8 @@ class CorpusAnalysisClient {
         errorText = `Error ${response.payload.code} - ${response.payload.msg}`;
         nopaque.flash("error", errorText);
         if (this.displays.query.errorContainer != undefined)  {
-          this.displays.query.errorContainer.innerHTML = `<p class="red-text"><i class="material-icons tiny">error</i> ${errorText}</p>`;
+          this.displays.query.errorContainer.innerHTML = `<p class="red-text">`+
+                    `<i class="material-icons tiny">error</i> ${errorText}</p>`;
         }
         if (this.displays.query != undefined)  {
           this.displays.query.setVisibilityByStatus("error");
@@ -54,13 +56,18 @@ class CorpusAnalysisClient {
       }
     });
 
+
     socket.on("corpus_analysis_query_results", (response) => {
-        if (this.callbacks.query_results != undefined) {this.callbacks.query_results(response.payload);}
+        if (this.callbacks.query_results != undefined) {
+          this.callbacks.query_results(response.payload);
+        }
     });
 
-    // TODO: set callback for this
-    // get context of one match if inspected via socket.io
-    socket.on("corpus_analysis_inspect_match", (response) => { results.resultsList.showMatchContext(response)});
+    socket.on("corpus_analysis_inspect_match", (response) => {
+      if (this.callbacks.query_match_context != undefined) {
+        this.callbacks.query_match_context(response);
+      }
+    });
   }
 
   init() {
diff --git a/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2
index d1764a32..2fb083b6 100644
--- a/app/templates/corpora/analyse_corpus.html.j2
+++ b/app/templates/corpora/analyse_corpus.html.j2
@@ -360,6 +360,9 @@
     client.setCallback("query_results", (payload) => {
       queryRenderResults(payload);
     });
+    client.setCallback("query_match_context", (payload) => {
+      results.resultsList.showMatchContext(payload);
+    })
 
     // Trigger corpus analysis initialization on server side
     client.init();