diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
index 92adae679a2..196fb791c96 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/templates/components/discourse-local-dates-create-form.hbs
@@ -4,23 +4,23 @@
   style="overflow: auto"}}
 
   <div class="form">
-    {{#unless isValid}}
-      <div class="validation-error alert alert-error">
-        {{i18n "discourse_local_dates.create.form.invalid_date"}}
-      </div>
-    {{else}}
+    {{#if isValid}}
       {{#if timezoneIsDifferentFromUserTimezone}}
         <div class="preview alert alert-info">
           <b>{{formatedCurrentUserTimezone}} </b>{{currentPreview}}
         </div>
       {{/if}}
-    {{/unless}}
+    {{else}}
+      <div class="validation-error alert alert-error">
+        {{i18n "discourse_local_dates.create.form.invalid_date"}}
+      </div>
+    {{/if}}
 
     {{computeDate}}
 
     <div class="date-time-configuration">
       <div class="inputs-panel">
-        <div class="date-time-control from {{if fromSelected 'is-selected'}} {{if fromFilled 'is-filled'}}">
+        <div class="date-time-control from {{if fromSelected "is-selected"}} {{if fromFilled "is-filled"}}">
           {{d-icon "calendar-alt"}}
           {{d-button
             id="from-date-time"
@@ -29,7 +29,7 @@
             class="date-time"}}
         </div>
 
-        <div class="date-time-control to {{if toSelected 'is-selected'}} {{if toFilled 'is-filled'}}">
+        <div class="date-time-control to {{if toSelected "is-selected"}} {{if toFilled "is-filled"}}">
           {{d-icon "calendar-alt"}}
           {{d-button
             action=(action "focusTo")
@@ -61,12 +61,12 @@
         {{/if}}
 
         {{#if toSelected}}
-        {{#if toDate}}
-          <div class="time-pickers">
-            {{d-icon "far-clock"}}
-            {{input maxlength=5 placeholder="hh:mm" input=(action "setToTime") type="time" value=toTime class="time-picker"}}
-          </div>
-        {{/if}}
+          {{#if toDate}}
+            <div class="time-pickers">
+              {{d-icon "far-clock"}}
+              {{input maxlength=5 placeholder="hh:mm" input=(action "setToTime") type="time" value=toTime class="time-picker"}}
+            </div>
+          {{/if}}
         {{/if}}
       </div>
 
@@ -102,7 +102,7 @@
           <label>{{i18n "discourse_local_dates.create.form.format_title"}}</label>
           <p>
             {{i18n "discourse_local_dates.create.form.format_description"}}
-            <a target="_blank" rel="noopener" href="https://momentjs.com/docs/#/parsing/string-format/">
+            <a target="_blank" href="https://momentjs.com/docs/#/parsing/string-format/" rel="noopener noreferrer">
               {{d-icon "question-circle"}}
             </a>
           </p>
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
index 636ba39a268..002a2d31895 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/templates/components/topic-presence-display.hbs
@@ -6,7 +6,7 @@
       {{/each}}
     </div>
     <span class="presence-text">
-      <span class="description">{{i18n 'presence.replying_to_topic' count=users.length}}</span>{{!-- (using comment to stop whitespace)
+      <span class="description">{{i18n "presence.replying_to_topic" count=users.length}}</span>{{!-- (using comment to stop whitespace)
   --}}<span class="wave"><span class="dot">.</span><span class="dot">.</span><span class="dot">.</span></span>
     </span>
   </div>
diff --git a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs b/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
index b56106982e3..80431a13354 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/components/poll-breakdown-option.hbs
@@ -3,6 +3,7 @@
   style={{this.colorBackgroundStyle}}
   {{on "mouseover" @onMouseOver}}
   {{on "mouseout" @onMouseOut}}
+  role="button"
 >
   <span class="poll-breakdown-option-color" style={{this.colorPreviewStyle}}></span>
 
@@ -13,5 +14,5 @@
       {{@option.votes}}
     {{/if}}
   </span>
-  <span class="poll-breakdown-option-text">{{{@option.html}}}</span>
+  <span class="poll-breakdown-option-text">{{html-safe @option.html}}</span>
 </li>