diff --git a/assets/javascripts/discourse/components/query-result.js.es6 b/assets/javascripts/discourse/components/query-result.js.es6
index d536402..5df2d8a 100644
--- a/assets/javascripts/discourse/components/query-result.js.es6
+++ b/assets/javascripts/discourse/components/query-result.js.es6
@@ -80,7 +80,13 @@ const QueryResultComponent = Ember.Component.extend({
       if (self.get('content.colrender')[idx]) {
         viewName = self.get('content.colrender')[idx];
       }
-      const template = getOwner(self).lookup('template:explorer/' + viewName + '.raw');
+
+      // After `findRawTemplates` is in stable this should be updated to use that
+      let template = getOwner(self).lookup('template:explorer/' + viewName + '.raw');
+      if (!template) {
+        template = Discourse.RAW_TEMPLATES[`javascripts/explorer/${viewName}`];
+      }
+
       return {name: viewName, template };
     });
   }.property('content', 'columns.@each'),
diff --git a/assets/javascripts/discourse/components/query-row-content.js.es6 b/assets/javascripts/discourse/components/query-row-content.js.es6
index e480d8f..6f1c8e2 100644
--- a/assets/javascripts/discourse/components/query-row-content.js.es6
+++ b/assets/javascripts/discourse/components/query-row-content.js.es6
@@ -68,7 +68,6 @@ const QueryRowContentComponent = Ember.Component.extend(bufferedRender({
         return new Handlebars.SafeString((t.template || fallback)(ctx, params));
       } catch (e) {
         console.error(e);
-        debugger;
         return "error";
       }
     });