diff --git a/Gemfile.lock b/Gemfile.lock
index 259af31..9205aec 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,4 +31,4 @@ DEPENDENCIES
   rubocop-discourse
 
 BUNDLED WITH
-   2.2.7
+   2.2.15
diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
index 916a46a..b8a06e3 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs
@@ -30,7 +30,7 @@
           {{#if selectedItem}}
             {{#if editing}}
               <div class="name">
-                  {{d-button action=(action "goHome") icon="chevron-left" class="previous"}}
+                {{d-button action=(action "goHome") icon="chevron-left" class="previous"}}
                 <div class="name-text-field">
                   {{text-field value=selectedItem.name}}
                 </div>
@@ -42,9 +42,10 @@
             {{else}}
               <div class="name">
                 {{d-button action=(action "goHome") icon="chevron-left" class="previous"}}
-                <h1>{{selectedItem.name}}
+                <h1>
+                  {{selectedItem.name}}
                   {{#unless editDisabled}}
-                    <a {{action "editName" class="edit-query-name"}}>{{d-icon "pencil-alt"}}</a>
+                    <a href {{action "editName" class="edit-query-name"}}>{{d-icon "pencil-alt"}}</a>
                   {{/unless}}
                 </h1>
               </div>
@@ -212,32 +213,32 @@
                       <medium>{{query.username}}</medium>
                     </a>
                   {{/if}}
-                </td>
-                <td class="query-group-names">
-                  {{#each query.group_names as |group|}}
-                    {{share-report group=group query=query}}
-                  {{/each}}
-                </td>
-                <td class="query-created-at">
-                  {{#if query.last_run_at}}
-                    <medium>
-                      {{bound-date query.last_run_at}}
-                    </medium>
-                  {{else if query.created_at}}
-                    <medium>
-                      {{bound-date query.created_at}}
-                    </medium>
-                  {{/if}}
-                </td>
-              </tr>
-            {{else}}
-              <br>
-              <em class="no-search-results"> {{i18n "explorer.no_search_results"}}</em>
-            {{/each}}
-          </tbody>
-        </table>
-      </div>
-    {{/if}}
+                  </td>
+                  <td class="query-group-names">
+                    {{#each query.group_names as |group|}}
+                      {{share-report group=group query=query}}
+                    {{/each}}
+                  </td>
+                  <td class="query-created-at">
+                    {{#if query.last_run_at}}
+                      <medium>
+                        {{bound-date query.last_run_at}}
+                      </medium>
+                    {{else if query.created_at}}
+                      <medium>
+                        {{bound-date query.created_at}}
+                      </medium>
+                    {{/if}}
+                  </td>
+                </tr>
+              {{else}}
+                <br>
+                <em class="no-search-results"> {{i18n "explorer.no_search_results"}}</em>
+              {{/each}}
+            </tbody>
+          </table>
+        </div>
+      {{/if}}
 
       <div class="explorer-pad-bottom"></div>
 
diff --git a/assets/javascripts/discourse/templates/components/explorer-schema-enuminfo.hbs b/assets/javascripts/discourse/templates/components/explorer-schema-enuminfo.hbs
index b5e98b3..0fbba51 100644
--- a/assets/javascripts/discourse/templates/components/explorer-schema-enuminfo.hbs
+++ b/assets/javascripts/discourse/templates/components/explorer-schema-enuminfo.hbs
@@ -1,5 +1,5 @@
 {{#each enuminfo as |enum|}}
-  <li value="{{enum.value}}">
+  <li value={{enum.value}}>
     {{enum.name}}
   </li>
 {{/each}}
diff --git a/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs b/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs
index c7dddc2..6af967c 100644
--- a/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs
+++ b/assets/javascripts/discourse/templates/components/explorer-schema-onetable.hbs
@@ -9,36 +9,36 @@
 <div class="schema-table-cols">
   {{#if open}}
     <dl>
-    {{#each table.columns as |col|}}
-      <div>
-      <dt class="{{if col.sensitive "sensitive"}}" title="{{if col.sensitive (i18n "explorer.schema.sensitive")}}">
-        {{#if col.sensitive}}
-          {{d-icon "exclamation-triangle"}}
-        {{/if}}
-        {{col.column_name}}
-      </dt>
-      <dd>
-        {{col.data_type}}
-        {{#if col.havetypeinfo}}
-          <br>
-          {{#if col.havepopup}}
-            <div class="popup-info">
-              {{d-icon "info"}}
-              <div class="popup">
-                {{col.column_desc}}
-                {{#if col.enum}}
-                  {{explorer-schema-enuminfo col=col}}
-                {{/if}}
-              </div>
-            </div>
-          {{/if}}
-          <span class="schema-typenotes">
-            {{col.notes}}
-          </span>
-        {{/if}}
-      </dd>
-      </div>
-    {{/each}}
+      {{#each table.columns as |col|}}
+        <div>
+          <dt class={{if col.sensitive "sensitive"}} title={{if col.sensitive (i18n "explorer.schema.sensitive")}}>
+            {{#if col.sensitive}}
+              {{d-icon "exclamation-triangle"}}
+            {{/if}}
+            {{col.column_name}}
+          </dt>
+          <dd>
+            {{col.data_type}}
+            {{#if col.havetypeinfo}}
+              <br>
+              {{#if col.havepopup}}
+                <div class="popup-info">
+                  {{d-icon "info"}}
+                  <div class="popup">
+                    {{col.column_desc}}
+                    {{#if col.enum}}
+                      {{explorer-schema-enuminfo col=col}}
+                    {{/if}}
+                  </div>
+                </div>
+              {{/if}}
+              <span class="schema-typenotes">
+                {{col.notes}}
+              </span>
+            {{/if}}
+          </dd>
+        </div>
+      {{/each}}
     </dl>
   {{/if}}
 </div>
diff --git a/assets/javascripts/discourse/templates/components/explorer-schema.hbs b/assets/javascripts/discourse/templates/components/explorer-schema.hbs
index 5c8c457..75c08db 100644
--- a/assets/javascripts/discourse/templates/components/explorer-schema.hbs
+++ b/assets/javascripts/discourse/templates/components/explorer-schema.hbs
@@ -1,4 +1,4 @@
-<div class="{{if hideSchema "hidden"}}">
+<div class={{if hideSchema "hidden"}}>
   {{text-field value=filter placeholderKey="explorer.schema.filter"}}
   {{d-button action=(action "collapseSchema") icon="chevron-right" class="no-text"}}
   {{conditional-loading-spinner condition=loading}}
diff --git a/assets/javascripts/discourse/templates/components/json-file-uploader.hbs b/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
index 315adc3..f3baef5 100644
--- a/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
+++ b/assets/javascripts/discourse/templates/components/json-file-uploader.hbs
@@ -1,7 +1,7 @@
 <div class="jsfu-shade-container">
   <div class="jsfu-file">
     <input id="js-file-input" type="file" style="display:none;" accept={{accept}}>
-    {{d-button class="fileSelect" action=(action "selectFile") class="" icon="upload" label="upload_selector.select_file"}}
+    {{d-button class="fileSelect" action=(action "selectFile") icon="upload" label="upload_selector.select_file"}}
     {{conditional-loading-spinner condition=loading size="small"}}
   </div>
   <div class="jsfu-separator">
@@ -12,5 +12,5 @@
   <div class="jsfu-paste">
     {{textarea value=value}}
   </div>
-  <div class="jsfu-shade {{if hover '' 'hidden'}}"><span class="text">{{d-icon "upload"}}</span></div>
+  <div class="jsfu-shade {{if hover "" "hidden"}}"><span class="text">{{d-icon "upload"}}</span></div>
 </div>
diff --git a/assets/javascripts/discourse/templates/components/share-report.hbs b/assets/javascripts/discourse/templates/components/share-report.hbs
index 4a6624a..a21b345 100644
--- a/assets/javascripts/discourse/templates/components/share-report.hbs
+++ b/assets/javascripts/discourse/templates/components/share-report.hbs
@@ -3,9 +3,9 @@
   {{group}}
 </div>
 {{#if visible}}
-  <div class='popup'>
+  <div class="popup">
     <label>{{i18n "explorer.link"}} {{group}}</label>
-    <input type="text" value={{link}}/>
+    <input type="text" value={{link}}>
     {{d-button action="close" class="btn-flat close" icon="times" aria-label="share.close" title="share.close"}}
   </div>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/connectors/group-reports-nav-item/nav-item.hbs b/assets/javascripts/discourse/templates/connectors/group-reports-nav-item/nav-item.hbs
index 683464b..2c9cbfe 100644
--- a/assets/javascripts/discourse/templates/connectors/group-reports-nav-item/nav-item.hbs
+++ b/assets/javascripts/discourse/templates/connectors/group-reports-nav-item/nav-item.hbs
@@ -1,3 +1,3 @@
-{{#link-to 'group.reports'}}
-  {{d-icon 'chart-bar'}}{{i18n 'group.reports'}}
+{{#link-to "group.reports"}}
+  {{d-icon "chart-bar"}}{{i18n "group.reports"}}
 {{/link-to}}
diff --git a/assets/javascripts/discourse/templates/explorer-query-result.hbs b/assets/javascripts/discourse/templates/explorer-query-result.hbs
index 65dbdfa..983367e 100644
--- a/assets/javascripts/discourse/templates/explorer-query-result.hbs
+++ b/assets/javascripts/discourse/templates/explorer-query-result.hbs
@@ -37,19 +37,19 @@
     {{else}}
       <table>
         <thead>
-        <tr class="headers">
-          {{#each columnDispNames as |col|}}
-            <th>{{col}}</th>
-          {{/each}}
-        </tr>
+          <tr class="headers">
+            {{#each columnDispNames as |col|}}
+              <th>{{col}}</th>
+            {{/each}}
+          </tr>
         </thead>
         <tbody>
-        {{#each rows as |row|}}
-          {{query-row-content
-            row=row
-            fallbackTemplate=fallbackTemplate
-            columnTemplates=columnTemplates}}
-        {{/each}}
+          {{#each rows as |row|}}
+            {{query-row-content
+              row=row
+              fallbackTemplate=fallbackTemplate
+              columnTemplates=columnTemplates}}
+          {{/each}}
         </tbody>
       </table>
     {{/if}}
diff --git a/assets/javascripts/discourse/templates/explorer/badge.raw.hbs b/assets/javascripts/discourse/templates/explorer/badge.raw.hbs
index cc2da35..da138e7 100644
--- a/assets/javascripts/discourse/templates/explorer/badge.raw.hbs
+++ b/assets/javascripts/discourse/templates/explorer/badge.raw.hbs
@@ -1,6 +1,8 @@
 {{! source: badge-button component }}
 <a href="{{baseuri}}/badges/{{badge.id}}/{{badge.name}}"
-   class="user-badge {{badge.badgeTypeClassName}}"
-   title="{{badge.display_name}}"
-   data-badge-name="{{badge.name}}">{{icon-or-image badge.icon}}
-<span class="badge-display-name">{{badge.display_name}}</span></a>
+  class="user-badge {{badge.badgeTypeClassName}}"
+  title={{badge.display_name}}
+  data-badge-name={{badge.name}}>
+  {{icon-or-image badge.icon}}
+  <span class="badge-display-name">{{badge.display_name}}</span>
+</a>
diff --git a/assets/javascripts/discourse/templates/explorer/html.raw.hbs b/assets/javascripts/discourse/templates/explorer/html.raw.hbs
index 741894a..b503046 100644
--- a/assets/javascripts/discourse/templates/explorer/html.raw.hbs
+++ b/assets/javascripts/discourse/templates/explorer/html.raw.hbs
@@ -1 +1 @@
-{{{value}}}
+{{html-safe value}}
diff --git a/assets/javascripts/discourse/templates/explorer/post.raw.hbs b/assets/javascripts/discourse/templates/explorer/post.raw.hbs
index 662e191..ef3238f 100644
--- a/assets/javascripts/discourse/templates/explorer/post.raw.hbs
+++ b/assets/javascripts/discourse/templates/explorer/post.raw.hbs
@@ -1,5 +1,5 @@
 {{#if post}}
-  <aside class="quote" data-post="{{post.post_number}}" data-topic="{{post.topic_id}}">
+  <aside class="quote" data-post={{post.post_number}} data-topic={{post.topic_id}}>
     <div class="title">
       <div class="quote-controls">
         <a href="/t/via-quote/{{post.topic_id}}/{{post.post_number}}"
@@ -13,7 +13,7 @@
     </div>
     <blockquote>
       <p>
-        {{{post.excerpt}}}
+        {{html-safe post.excerpt}}
       </p>
     </blockquote>
   </aside>
diff --git a/assets/javascripts/discourse/templates/explorer/topic.raw.hbs b/assets/javascripts/discourse/templates/explorer/topic.raw.hbs
index 2a58449..3f16e66 100644
--- a/assets/javascripts/discourse/templates/explorer/topic.raw.hbs
+++ b/assets/javascripts/discourse/templates/explorer/topic.raw.hbs
@@ -1,6 +1,8 @@
 {{#if topic}}
-  <a href="{{baseuri}}/t/{{topic.slug}}/{{topic.id}}"
-          >{{{topic.fancy_title}}}</a> ({{topic.posts_count}})
+  <a href="{{baseuri}}/t/{{topic.slug}}/{{topic.id}}">
+    {{html-safe topic.fancy_title}}
+  </a>
+  ({{topic.posts_count}})
 {{else}}
   <a href="{{baseuri}}/t/{{id}}">{{id}}</a>
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/explorer/url.raw.hbs b/assets/javascripts/discourse/templates/explorer/url.raw.hbs
index 4cf17da..dd264ac 100644
--- a/assets/javascripts/discourse/templates/explorer/url.raw.hbs
+++ b/assets/javascripts/discourse/templates/explorer/url.raw.hbs
@@ -1 +1 @@
-<a href="{{href}}">{{target}}</a>
+<a href={{href}}>{{target}}</a>
diff --git a/assets/javascripts/discourse/templates/explorer/user.raw.hbs b/assets/javascripts/discourse/templates/explorer/user.raw.hbs
index 5a091ff..ff2b787 100644
--- a/assets/javascripts/discourse/templates/explorer/user.raw.hbs
+++ b/assets/javascripts/discourse/templates/explorer/user.raw.hbs
@@ -1,6 +1,7 @@
 {{#if user}}
-  <a href="{{baseuri}}/u/{{user.username}}/activity"
-     data-user-card="{{user.username}}">{{avatar user imageSize="tiny"}} {{user.username}}</a>
+  <a href="{{baseuri}}/u/{{user.username}}/activity" data-user-card={{user.username}}>
+    {{avatar user imageSize="tiny"}} {{user.username}}
+  </a>
 {{else}}
   {{id}}
 {{/if}}
diff --git a/assets/javascripts/discourse/templates/group-reports-index.hbs b/assets/javascripts/discourse/templates/group-reports-index.hbs
index db20bf7..3ae2e91 100644
--- a/assets/javascripts/discourse/templates/group-reports-index.hbs
+++ b/assets/javascripts/discourse/templates/group-reports-index.hbs
@@ -1,5 +1,5 @@
-<section class='user-content'>
-  <table class='group-reports'>
+<section class="user-content">
+  <table class="group-reports">
     <thead>
       <th>
         {{i18n "explorer.report_name"}}
@@ -11,12 +11,11 @@
         {{i18n "explorer.query_time"}}
       </th>
     </thead>
-    <tr></tr>
     <tbody>
       {{#each queries as |query|}}
         <tr>
           <td>
-            {{#link-to 'group.reports.show' group.name query.id}}{{query.name}}{{/link-to}}
+            {{#link-to "group.reports.show" group.name query.id}}{{query.name}}{{/link-to}}
           </td>
           <td>{{query.description}}</td>
           <td>
diff --git a/assets/javascripts/discourse/templates/group-reports-show.hbs b/assets/javascripts/discourse/templates/group-reports-show.hbs
index 2e6c9da..6bbf0c0 100644
--- a/assets/javascripts/discourse/templates/group-reports-show.hbs
+++ b/assets/javascripts/discourse/templates/group-reports-show.hbs
@@ -1,4 +1,4 @@
-<section class='user-content'>
+<section class="user-content">
   <h1>{{model.name}}</h1>
   <p>{{model.description}}</p>
   <form class="query-run" {{action "run" on="submit"}}>
diff --git a/assets/javascripts/discourse/templates/modal/import-query.hbs b/assets/javascripts/discourse/templates/modal/import-query.hbs
index 1f766d0..29de9df 100644
--- a/assets/javascripts/discourse/templates/modal/import-query.hbs
+++ b/assets/javascripts/discourse/templates/modal/import-query.hbs
@@ -1,10 +1,10 @@
 {{#d-modal-body title="explorer.import.modal"}}
   <form {{action "dummy" on="submit"}}>
-    <div class='modal-body'>
+    <div class="modal-body">
       {{json-file-uploader value=queryFile extension=".dcquery.json"}}
     </div>
     <div class="modal-footer">
-      {{d-button class='btn-primary' action='doImport' type='submit' disabled=notReady icon="plus" label='explorer.import.label'}}
+      {{d-button class="btn-primary" action="doImport" type="submit" disabled=notReady icon="plus" label="explorer.import.label"}}
     </div>
   </form>
 {{/d-modal-body}}