diff --git a/public/app/containers/AlertRuleList/__snapshots__/AlertRuleList.jest.tsx.snap b/public/app/containers/AlertRuleList/__snapshots__/AlertRuleList.jest.tsx.snap
new file mode 100644
index 00000000000..b15a8605b7a
--- /dev/null
+++ b/public/app/containers/AlertRuleList/__snapshots__/AlertRuleList.jest.tsx.snap
@@ -0,0 +1,72 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AlertRuleList should render 1 rule 1`] = `
+<li
+  className="card-item-wrapper"
+>
+  <div
+    className="card-item card-item--alert"
+  >
+    <div
+      className="card-item-header"
+    >
+      <div
+        className="card-item-type"
+      >
+        <a
+          className="card-item-cog"
+          onClick={[Function]}
+          title="Pausing an alert rule prevents it from executing"
+        >
+          <i
+            className="fa fa-pause"
+          />
+        </a>
+        <a
+          className="card-item-cog"
+          href="dashboard/db/mygool?panelId=3&fullscreen&edit&tab=alert"
+          title="Edit alert rule"
+        >
+          <i
+            className="icon-gf icon-gf-settings"
+          />
+        </a>
+      </div>
+    </div>
+    <div
+      className="card-item-body"
+    >
+      <div
+        className="card-item-details"
+      >
+        <div
+          className="card-item-name"
+        >
+          <a
+            href="dashboard/db/mygool?panelId=3&fullscreen&edit&tab=alert"
+          >
+            Panel Title alert
+          </a>
+        </div>
+        <div
+          className="card-item-sub-name"
+        >
+          <span
+            className="alert-list-item-state alert-state-ok"
+          >
+            <i
+              className="icon-gf icon-gf-online"
+            />
+             
+            OK
+          </span>
+          <span>
+             for 
+            5 minutes
+          </span>
+        </div>
+      </div>
+    </div>
+  </div>
+</li>
+`;
diff --git a/public/app/stores/ViewStore.ts b/public/app/stores/ViewStore.ts
index 8d4df403e72..6095e45fc9d 100644
--- a/public/app/stores/ViewStore.ts
+++ b/public/app/stores/ViewStore.ts
@@ -2,10 +2,12 @@ import { types } from 'mobx-state-tree';
 import _ from 'lodash';
 import $ from 'jquery';
 
+let QueryValueType = types.union(types.string, types.boolean, types.number);
+
 export const ViewStore = types
   .model({
     path: types.string,
-    query: types.map(types.string),
+    query: types.map(QueryValueType),
   })
   .views(self => ({
     get currentUrl() {