diff --git a/src/datasource/partials/config.html b/src/datasource/partials/config.html
index 27b755a..6482ac2 100644
--- a/src/datasource/partials/config.html
+++ b/src/datasource/partials/config.html
@@ -35,7 +35,7 @@
             class="gf-form-input"
             ng-model="ctrl.current.access"
             ng-options="f.key as f.value for f in ctrl.ACCESS_OPTIONS"
-          />
+          ></select>
         </div>
       </div>
       <div class="gf-form">
@@ -74,7 +74,7 @@
           ng-model="ctrl.current.jsonData.keepCookies"
           width-class="width-20" tagclass="label label-tag"
           placeholder="Add Name"
-        />
+        ></bootstrap-tagsinput>
         <info-popover mode="right-absolute">
           Grafana Proxy deletes forwarded cookies by default. Specify cookies by name
           that should be forwarded to the data source.
diff --git a/src/panel/graph_panel/partials/analytic_unit_5.x_6.x.html b/src/panel/graph_panel/partials/analytic_unit_5.x_6.x.html
index ff439f6..206816b 100644
--- a/src/panel/graph_panel/partials/analytic_unit_5.x_6.x.html
+++ b/src/panel/graph_panel/partials/analytic_unit_5.x_6.x.html
@@ -16,7 +16,7 @@
         ng-model="analyticUnit.type"
         ng-options="type.value as type.name for type in ctrl.analyticUnitTypes[analyticUnit.detectorType]"
         ng-disabled="true"
-      />
+      ></select>
     </div>
   </div>
   <div class="gf-form gf-form--grow">
@@ -31,7 +31,7 @@
       <color-picker
         color="analyticUnit.labeledColor"
         onChange="ctrl.onColorChange.bind(ctrl, analyticUnit.id, false)"
-      />
+      ></color-picker>
     </label>
   </div>
 
@@ -43,7 +43,7 @@
       <color-picker
         color="analyticUnit.deletedColor"
         onChange="ctrl.onColorChange.bind(ctrl, analyticUnit.id, true)"
-      />
+      ></color-picker>
     </label>
   </div>
   <div class="gf-form gf-form--grow">
@@ -63,7 +63,7 @@
       ng-model="analyticUnit.condition"
       ng-options="type for type in ctrl.analyticsController.conditions"
       ng-change="ctrl.onAnalyticUnitChange(analyticUnit)"
-    />
+    ></select>
     <input class="gf-form-input width-4"
       ng-if="analyticUnit.condition !== 'NO_DATA'"
       type="number"
@@ -117,7 +117,7 @@
       label-class="query-keyword width-8"
       on-change="ctrl.onAnalyticUnitChange(analyticUnit)"
       checked="analyticUnit.hasSeasonality"
-    />
+    ></gf-form-switch>
   </div>
 
   <div class="gf-form" ng-if="analyticUnit.hasSeasonality">
@@ -138,7 +138,7 @@
         ng-model="analyticUnit.seasonalityPeriod.unit"
         ng-change="ctrl.onSeasonalityChange(analyticUnit.id)"
         ng-options="type for type in ['seconds', 'minutes', 'hours', 'days', 'years']"
-      />
+      ></select>
     </div>
   </div>
 
@@ -155,7 +155,7 @@
         ng-model="analyticUnit.enableBounds"
         ng-change="ctrl.onAnalyticUnitChange(analyticUnit)"
         ng-options="bound.value as bound.name for bound in ctrl.boundTypes"
-      />
+      ></select>
     </div>
   </div>
   <div class="gf-form gf-form--grow">
diff --git a/src/panel/graph_panel/partials/analytic_unit_7.x.html b/src/panel/graph_panel/partials/analytic_unit_7.x.html
index 975b26a..5823217 100644
--- a/src/panel/graph_panel/partials/analytic_unit_7.x.html
+++ b/src/panel/graph_panel/partials/analytic_unit_7.x.html
@@ -28,7 +28,7 @@
       <color-picker
         color="analyticUnit.labeledColor"
         onChange="ctrl.onColorChange.bind(ctrl, analyticUnit.id, false)"
-      />
+      ></color-picker>
     </label>
   </div>
 
@@ -40,7 +40,7 @@
       <color-picker
         color="analyticUnit.deletedColor"
         onChange="ctrl.onColorChange.bind(ctrl, analyticUnit.id, true)"
-      />
+      ></color-picker>
     </label>
   </div>
 </div>
@@ -107,7 +107,7 @@
       label-class="query-keyword"
       on-change="ctrl.onAnalyticUnitChange(analyticUnit)"
       checked="analyticUnit.hasSeasonality"
-    />
+    ></gf-form-switch>
   </div>
 
   <div class="gf-form" ng-if="analyticUnit.hasSeasonality">
diff --git a/src/panel/graph_panel/partials/analytic_units_5.x.html b/src/panel/graph_panel/partials/analytic_units_5.x.html
index 87f1cc7..430d88f 100644
--- a/src/panel/graph_panel/partials/analytic_units_5.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_5.x.html
@@ -113,7 +113,7 @@
       ng-model="ctrl.analyticsController.labelingMode"
       ng-options="type.value as type.name for type in analyticUnit.labelingModes"
       ng-disabled="analyticUnit.status === 'LEARNING'"
-    />
+    ></select>
 
     <label class="gf-form-label"
       ng-if="analyticUnit.selected && !analyticUnit.saving"
diff --git a/src/panel/graph_panel/partials/analytic_units_6.x.html b/src/panel/graph_panel/partials/analytic_units_6.x.html
index 8377863..679bdd7 100644
--- a/src/panel/graph_panel/partials/analytic_units_6.x.html
+++ b/src/panel/graph_panel/partials/analytic_units_6.x.html
@@ -102,7 +102,7 @@
         ng-model="ctrl.analyticsController.labelingMode"
         ng-options="type.value as type.name for type in analyticUnit.labelingModes"
         ng-disabled="analyticUnit.status === 'LEARNING'"
-      />
+      ></select>
 
       <button class="query-editor-row__action"
         ng-if="analyticUnit.selected && !analyticUnit.saving"
diff --git a/src/panel/graph_panel/partials/axes_editor.html b/src/panel/graph_panel/partials/axes_editor.html
index b992cfb..6a7f663 100644
--- a/src/panel/graph_panel/partials/axes_editor.html
+++ b/src/panel/graph_panel/partials/axes_editor.html
@@ -12,7 +12,7 @@
 				<div 
 					class="gf-form-dropdown-typeahead max-width-20" ng-model="yaxis.format" 
 					dropdown-typeahead2="ctrl.unitFormats" dropdown-typeahead-on-select="ctrl.setUnitFormat(yaxis, $subItem)"
-				/>
+				></div>
 			</div>
 
 			<div class="gf-form">
diff --git a/src/panel/graph_panel/partials/new_analytic_unit.html b/src/panel/graph_panel/partials/new_analytic_unit.html
index db47c9d..6de9bdb 100644
--- a/src/panel/graph_panel/partials/new_analytic_unit.html
+++ b/src/panel/graph_panel/partials/new_analytic_unit.html
@@ -20,7 +20,7 @@
         ng-model="ctrl.analyticsController.newAnalyticUnit.detectorType"
         ng-options="analyticUnitDetectorType for analyticUnitDetectorType in ctrl.analyticUnitDetectorTypes"
         ng-change="ctrl.analyticsController.onAnalyticUnitDetectorChange(ctrl.analyticUnitTypes);"
-      />
+      ></select>
     </div>
   </div>
 
@@ -33,7 +33,7 @@
           type.value as type.name
           for type in ctrl.analyticUnitTypes[ctrl.analyticsController.newAnalyticUnit.detectorType]
         "
-      />
+      ></select>
     </div>
   </div>
 
diff --git a/src/panel/graph_panel/partials/reconnect_to_datasource.html b/src/panel/graph_panel/partials/reconnect_to_datasource.html
index b1cbe6e..21a2f75 100644
--- a/src/panel/graph_panel/partials/reconnect_to_datasource.html
+++ b/src/panel/graph_panel/partials/reconnect_to_datasource.html
@@ -7,7 +7,7 @@
         <i class="fa fa-check" ng-show="ctrl.connectionStatus.status !== 'error'"></i>
       </div>
       <div class="alert-body">
-        <div class="alert-title" ng-bind-html="ctrl.connectionStatus.message" />
+        <div class="alert-title" ng-bind-html="ctrl.connectionStatus.message"></div>
       </div>
     </div>
     <div ng-hide="ctrl.connectionStatus.status === 'info'">
diff --git a/src/panel/graph_panel/partials/tab_webhooks.html b/src/panel/graph_panel/partials/tab_webhooks.html
index d340d3a..fea3ae7 100644
--- a/src/panel/graph_panel/partials/tab_webhooks.html
+++ b/src/panel/graph_panel/partials/tab_webhooks.html
@@ -11,7 +11,7 @@
       <gf-form-switch
         on-change="ctrl.onAnalyticUnitAlertChange(analyticUnit)"
         checked="analyticUnit.alert"
-      />
+      ></gf-form-switch>
     </div>
   </div>
 </div>
diff --git a/src/panel/graph_panel/template.html b/src/panel/graph_panel/template.html
index a91686f..f2723ea 100644
--- a/src/panel/graph_panel/template.html
+++ b/src/panel/graph_panel/template.html
@@ -1,4 +1,4 @@
 <div class="graph-panel" ng-class="{'graph-panel--legend-right': ctrl.panel.legend.rightSide}">
-  <div class="graph-panel__chart" id="graphPanel" ng-dblclick="ctrl.zoomOut()" />
-  <div class="hastic-graph-legend" id="graphLegend" />
+  <div class="graph-panel__chart" id="graphPanel" ng-dblclick="ctrl.zoomOut()"></div>
+  <div class="hastic-graph-legend" id="graphLegend"></div>
 </div>