diff --git a/src/app/directives/templateParamSelector.js b/src/app/directives/templateParamSelector.js
index 8a21f75ef54..3bd2190fe44 100644
--- a/src/app/directives/templateParamSelector.js
+++ b/src/app/directives/templateParamSelector.js
@@ -145,6 +145,7 @@ function (angular, app, _, $) {
             if (selected.length > 1) {
               if (selected[0].text === 'All') {
                 selected = selected.slice(1, selected.length);
+                debugger;
               }
             }
 
diff --git a/src/app/features/dashboard/partials/variableValueSelect.html b/src/app/features/dashboard/partials/variableValueSelect.html
index cc9d3b08f1b..490a84b257a 100644
--- a/src/app/features/dashboard/partials/variableValueSelect.html
+++ b/src/app/features/dashboard/partials/variableValueSelect.html
@@ -13,10 +13,9 @@
 
 	<div class="variable-options-container" ng-if="!query.tagcloud">
 		<div class="variable-option pointer" bindonce ng-repeat="option in options"
-				ng-class="{'selected': $index === selectedIndex }" ng-href="{{row.url}}">
-				<input class="cr1" id="var.option.{{$id}}" type="checkbox" ng-model="option.selected" ng-checked="option.selected" ng-change="optionSelected(option)">
-				<label for="var.option.{{$id}}" class="cr1"></label>
-				<label for="var.option.{{$id}}" class="checkbox-label">{{option.text}}</label>
+				ng-class="{'selected': selected}" ng-href="{{row.url}}">
+				<i class="variable-option-check"></i>
+				<label for="var.option.{{$id}}" label">{{option.text}}</label>
 			</div>
 		</div>
 	</div>