diff --git a/shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css b/shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
index 5c6a57033..9e116bad1 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
+++ b/shrine-webclient/src/main/js/client/js-shrine/assets/css/styles.css
@@ -1,258 +1,258 @@
 .mailto {
   box-sizing: border-box;
   display: flex;
   justify-content: center;
   align-items: center;
   width: 100%;
   height: 100%;
   padding: 10px;
   color: #333;
   background: #f2f2f2;
   height: 100% p;
     height-font-size: 16px;
     height-line-height: 1.6em; }
   .mailto .button {
     border: 1px solid #6576a8;
     background: #6d85ad;
     border: 0;
     outline: 0;
     font-weight: bold;
     text-transform: uppercase;
     text-decoration: none;
     letter-spacing: 1px;
     color: #fff;
     cursor: pointer; }
     .mailto .button:hover {
       background: #9cb8d9; }
     .mailto .button:active {
       background: #6576a8; }
   .mailto .button--large {
     position: relative;
     padding: 15px 30px;
     border-radius: 5px;
     font-size: 16px; }
     .mailto .button--large:active {
       top: 1px; }
   .mailto .content {
     max-width: 350px;
     text-align: center; }
   .mailto .email {
     position: relative; }
 
 @import url(http://fonts.googleapis.com/css?family=Roboto:400,500,300,700);
 body {
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);
   font-family: 'Roboto', sans-serif; }
 
 html,
 body,
 .box-wrapper {
   width: 100%;
   height: 100%;
   margin: 0; }
 
 .box-wrapper {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
   -webkit-box-orient: vertical;
   -webkit-box-direction: normal;
   -ms-flex-direction: column;
   flex-direction: column;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap; }
 
 .box-wrapper > .box {
   margin-top: 1%;
   width: 100%;
   transition: all .2s ease; }
   .box-wrapper > .box .hideextra {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis; }
   .box-wrapper > .box section {
     margin: 20 0 6 0; }
     .box-wrapper > .box section .v-full {
       height: 90vh; }
     .box-wrapper > .box section .v-full > table {
       padding-bottom: 10%; }
     .box-wrapper > .box section .v-min {
       height: 100px; }
     .box-wrapper > .box section .v-min > table {
       padding-bottom: 1%; }
     .box-wrapper > .box section .tbl-content {
       overflow: auto;
       margin-top: 0px;
       border: 1px solid rgba(98, 108, 146, 0.3); }
   .box-wrapper > .box table {
     width: 100%;
     table-layout: fixed; }
     .box-wrapper > .box table .tbl-header {
       background-color: rgba(98, 108, 146, 0.3); }
       .box-wrapper > .box table .tbl-header div.tbl-header {
         max-width: 5rem; }
     .box-wrapper > .box table tr {
       background: white;
       cursor: pointer; }
       .box-wrapper > .box table tr:hover {
         background: rgba(98, 108, 146, 0.3) !important; }
       .box-wrapper > .box table tr:nth-child(odd) {
         background: rgba(98, 108, 146, 0.1); }
     .box-wrapper > .box table th {
       padding: 2px 4px 4px 2px;
       text-align: left;
       font-weight: 500;
       font-size: .75rem;
       color: #626C92;
       text-transform: uppercase;
       border-bottom: solid 1px rgba(98, 108, 146, 0.1);
       border-left: solid 1px rgba(98, 108, 146, 0.1); }
     .box-wrapper > .box table td {
       transition: all .5s ease;
       padding: 2px;
       text-align: left;
       vertical-align: top;
       font-weight: 300;
       font-size: 12px;
       color: black;
       border-bottom: solid 1px rgba(98, 108, 146, 0.1);
       border-left: solid 1px rgba(98, 108, 146, 0.1); }
 
 .circle-pagination {
   position: absolute;
   z-index: 1000;
   list-style-type: none;
   margin: 0;
   top: -.3rem; }
   .circle-pagination li {
     border-radius: 50%;
     border: 2px solid #626C92;
     width: 12px;
     height: 12px;
     padding: 4px;
     margin: 6px;
     cursor: pointer;
     float: left;
     transition: all .2s ease; }
     .circle-pagination li.active, .circle-pagination li:hover {
       background: #626C92;
       width: 14px;
       height: 14px; }
     .circle-pagination li.active div,
     .circle-pagination li div:hover {
       color: white; }
     .circle-pagination li div {
       font-size: .6rem;
       width: 24px;
       position: relative;
       left: -6px;
       top: 1px;
       color: #626C92;
       font-weight: 600;
       text-transform: capitalize; }
 
+@import url(http://fonts.googleapis.com/css?family=Roboto:400,300&subset=latin,latin-ext);
+ul.context-menu {
+  transition: opacity 0.2s linear;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  font: 200 11px "Roboto", sans-serif;
+  position: absolute;
+  color: #626C92;
+  box-shadow: 0 12px 15px 0 rgba(0, 0, 0, 0.2);
+  border-radius: 5px;
+  border: 1px solid rgba(98, 108, 146, 0.25); }
+  ul.context-menu * {
+    transition: color 0.2s, background 0.2s; }
+  ul.context-menu.hide {
+    visibility: hidden;
+    opacity: 0; }
+  ul.context-menu.show {
+    visibility: visible;
+    opacity: 1; }
+  ul.context-menu li {
+    min-width: 100px;
+    overflow: hidden;
+    white-space: nowrap;
+    padding: 6px 8px;
+    background-color: #fff;
+    border-bottom: 1px solid #ecf0f1; }
+    ul.context-menu li a {
+      color: #626C92;
+      text-decoration: none; }
+    ul.context-menu li:hover {
+      background-color: #ecf0f1;
+      color: #2980b9; }
+      ul.context-menu li:hover a {
+        color: #2980b9; }
+    ul.context-menu li:first-child {
+      border-radius: 5px 5px 0 0; }
+    ul.context-menu li:last-child {
+      border-bottom: 0;
+      border-radius: 0 0 5px 5px; }
+
 @import url(http://fonts.googleapis.com/css?family=Roboto:400,300&subset=latin,latin-ext);
 .loader {
   background: #fff;
   margin: 50px 300px;
   /*todo cleanup with mixin*/ }
   .loader h1 {
     color: #626C92;
     font: 300 11px "Roboto", sans-serif; }
   .loader div.slider {
     position: absolute;
     width: 200px;
     height: 2px;
     margin-top: -30px; }
     .loader div.slider div.line {
       position: absolute;
       background: rgba(0, 0, 0, 0.2);
       width: 200px;
       height: 2px; }
     .loader div.slider div.break {
       position: absolute;
       width: 50%;
       height: 2px; }
     .loader div.slider div.break.dot1 {
       animation: loading 2s infinite;
       background: #D9ECF0; }
     .loader div.slider div.break.dot2 {
       animation: loading 2s 0.5s infinite;
       background: #6677AA; }
     .loader div.slider div.break.dot3 {
       animation: loading 2s 1s infinite;
       background: #D9ECF0; }
 
 @-webkit-keyframes "loading" {
   from {
     left: 0;
     opacity: 1; }
   to {
     left: 200px;
     opacity: 1; } }
 
 @-moz-keyframes "loading" {
   from {
     left: 0;
     opacity: 0; }
   to {
     left: 200px;
     opacity: 1; } }
 
 @-o-keyframes "loading" {
   from {
     left: 0;
     opacity: 0; }
   to {
     left: 200px;
     opacity: 1; } }
 
 @keyframes "loading" {
   from {
     left: 0;
     opacity: 0; }
   to {
     left: 200px;
     opacity: 1; } }
-
-@import url(http://fonts.googleapis.com/css?family=Roboto:400,300&subset=latin,latin-ext);
-ul.context-menu {
-  transition: opacity 0.2s linear;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  font: 200 11px "Roboto", sans-serif;
-  position: absolute;
-  color: #626C92;
-  box-shadow: 0 12px 15px 0 rgba(0, 0, 0, 0.2);
-  border-radius: 5px;
-  border: 1px solid rgba(98, 108, 146, 0.25); }
-  ul.context-menu * {
-    transition: color 0.2s, background 0.2s; }
-  ul.context-menu.hide {
-    visibility: hidden;
-    opacity: 0; }
-  ul.context-menu.show {
-    visibility: visible;
-    opacity: 1; }
-  ul.context-menu li {
-    min-width: 100px;
-    overflow: hidden;
-    white-space: nowrap;
-    padding: 6px 8px;
-    background-color: #fff;
-    border-bottom: 1px solid #ecf0f1; }
-    ul.context-menu li a {
-      color: #626C92;
-      text-decoration: none; }
-    ul.context-menu li:hover {
-      background-color: #ecf0f1;
-      color: #2980b9; }
-      ul.context-menu li:hover a {
-        color: #2980b9; }
-    ul.context-menu li:first-child {
-      border-radius: 5px 5px 0 0; }
-    ul.context-menu li:last-child {
-      border-bottom: 0;
-      border-radius: 0 0 5px 5px; }
diff --git a/shrine-webclient/src/main/js/client/js-shrine/config.js b/shrine-webclient/src/main/js/client/js-shrine/config.js
index c08fa4341..3666b4201 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/config.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/config.js
@@ -1,350 +1,350 @@
 System.config({
   defaultJSExtensions: true,
   transpiler: false,
   paths: {
     "*": "dist/*",
     "github:*": "jspm_packages/github/*",
     "npm:*": "jspm_packages/npm/*"
   },
   map: {
     "aurelia-animator-css": "npm:aurelia-animator-css@1.0.1",
     "aurelia-bootstrapper": "npm:aurelia-bootstrapper@1.0.0",
     "aurelia-fetch-client": "npm:aurelia-fetch-client@1.0.1",
     "aurelia-framework": "npm:aurelia-framework@1.0.6",
     "aurelia-history-browser": "npm:aurelia-history-browser@1.0.0",
     "aurelia-loader-default": "npm:aurelia-loader-default@1.0.0",
     "aurelia-logging-console": "npm:aurelia-logging-console@1.0.0",
     "aurelia-pal-browser": "npm:aurelia-pal-browser@1.0.0",
     "aurelia-polyfills": "npm:aurelia-polyfills@1.1.1",
     "aurelia-router": "npm:aurelia-router@1.3.0",
     "aurelia-templating-binding": "npm:aurelia-templating-binding@1.0.0",
     "aurelia-templating-resources": "npm:aurelia-templating-resources@1.1.1",
     "aurelia-templating-router": "npm:aurelia-templating-router@1.0.0",
     "bluebird": "npm:bluebird@3.4.1",
     "bootstrap": "github:twbs/bootstrap@3.3.7",
     "fetch": "github:github/fetch@1.0.0",
     "font-awesome": "npm:font-awesome@4.7.0",
     "jquery": "npm:jquery@2.2.4",
     "text": "github:systemjs/plugin-text@0.0.8",
     "github:jspm/nodelibs-assert@0.1.0": {
       "assert": "npm:assert@1.4.1"
     },
     "github:jspm/nodelibs-buffer@0.1.0": {
       "buffer": "npm:buffer@3.6.0"
     },
     "github:jspm/nodelibs-process@0.1.2": {
       "process": "npm:process@0.11.9"
     },
     "github:jspm/nodelibs-util@0.1.0": {
       "util": "npm:util@0.10.3"
     },
     "github:jspm/nodelibs-vm@0.1.0": {
       "vm-browserify": "npm:vm-browserify@0.0.4"
     },
     "github:twbs/bootstrap@3.3.7": {
       "jquery": "npm:jquery@2.2.4"
     },
     "npm:assert@1.4.1": {
       "assert": "github:jspm/nodelibs-assert@0.1.0",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2",
       "util": "npm:util@0.10.3"
     },
     "npm:aurelia-animator-css@1.0.1": {
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-binding@1.0.9": {
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0"
     },
     "npm:aurelia-bootstrapper@1.0.0": {
       "aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.1",
       "aurelia-framework": "npm:aurelia-framework@1.0.6",
       "aurelia-history": "npm:aurelia-history@1.0.0",
       "aurelia-history-browser": "npm:aurelia-history-browser@1.0.0",
       "aurelia-loader-default": "npm:aurelia-loader-default@1.0.0",
       "aurelia-logging-console": "npm:aurelia-logging-console@1.0.0",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-pal-browser": "npm:aurelia-pal-browser@1.0.0",
       "aurelia-polyfills": "npm:aurelia-polyfills@1.1.1",
       "aurelia-router": "npm:aurelia-router@1.3.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1",
       "aurelia-templating-binding": "npm:aurelia-templating-binding@1.0.0",
       "aurelia-templating-resources": "npm:aurelia-templating-resources@1.1.1",
       "aurelia-templating-router": "npm:aurelia-templating-router@1.0.0"
     },
     "npm:aurelia-dependency-injection@1.3.1": {
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-event-aggregator@1.0.1": {
       "aurelia-logging": "npm:aurelia-logging@1.3.1"
     },
     "npm:aurelia-framework@1.0.6": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-history-browser@1.0.0": {
       "aurelia-history": "npm:aurelia-history@1.0.0",
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-loader-default@1.0.0": {
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-loader@1.0.0": {
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-path": "npm:aurelia-path@1.1.1"
     },
     "npm:aurelia-logging-console@1.0.0": {
       "aurelia-logging": "npm:aurelia-logging@1.3.1"
     },
     "npm:aurelia-metadata@1.0.3": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-pal-browser@1.0.0": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-polyfills@1.1.1": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-route-recognizer@1.1.0": {
       "aurelia-path": "npm:aurelia-path@1.1.1"
     },
     "npm:aurelia-router@1.3.0": {
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.1",
       "aurelia-history": "npm:aurelia-history@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-route-recognizer": "npm:aurelia-route-recognizer@1.1.0"
     },
     "npm:aurelia-task-queue@1.1.0": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-templating-binding@1.0.0": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-templating-resources@1.1.1": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-templating-router@1.0.0": {
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-router": "npm:aurelia-router@1.3.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-templating@1.1.1": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0"
     },
     "npm:bluebird@3.4.1": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:buffer@3.6.0": {
       "base64-js": "npm:base64-js@0.0.8",
       "child_process": "github:jspm/nodelibs-child_process@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "ieee754": "npm:ieee754@1.1.8",
       "isarray": "npm:isarray@1.0.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:font-awesome@4.7.0": {
       "css": "github:systemjs/plugin-css@0.1.33"
     },
     "npm:inherits@2.0.1": {
       "util": "github:jspm/nodelibs-util@0.1.0"
     },
     "npm:process@0.11.9": {
       "assert": "github:jspm/nodelibs-assert@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "vm": "github:jspm/nodelibs-vm@0.1.0"
     },
     "npm:util@0.10.3": {
       "inherits": "npm:inherits@2.0.1",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:vm-browserify@0.0.4": {
       "indexof": "npm:indexof@0.0.1"
     }
   },
-  depCache: {
-    "repository/qep.repository.js": [
-      "aurelia-framework",
-      "aurelia-fetch-client",
-      "fetch"
-    ],
-    "views/mailto/mailto.js": [
-      "aurelia-framework",
-      "views/mailto/mailto.service",
-      "views/mailto/mailto.config"
-    ],
-    "views/mailto/mailto.service.js": [
-      "aurelia-framework",
-      "repository/qep.repository"
-    ],
-    "views/query-viewer/context-menu/context-menu.js": [
-      "aurelia-framework",
-      "common/i2b2.service.js"
-    ],
-    "views/query-viewer/loading-bar/loading-bar.js": [
-      "aurelia-framework"
-    ],
-    "views/query-viewer/query-viewer.js": [
-      "aurelia-framework",
-      "views/query-viewer/query-viewer.service",
-      "common/i2b2.service.js",
-      "./query-viewer.model"
-    ],
-    "views/query-viewer/query-viewer.service.js": [
-      "aurelia-framework",
-      "repository/qep.repository",
-      "./query-viewer.config"
-    ]
-  },
   bundles: {
     "app-build.js": [
       "common/i2b2.service.js",
       "main.js",
       "repository/qep.repository.js",
       "shell.html!github:systemjs/plugin-text@0.0.8.js",
       "shell.js",
       "views/mailto/mailto.config.js",
       "views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",
       "views/mailto/mailto.js",
       "views/mailto/mailto.service.js",
       "views/query-viewer/box-style.converter.js",
       "views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",
       "views/query-viewer/context-menu/context-menu.js",
       "views/query-viewer/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",
       "views/query-viewer/loading-bar/loading-bar.js",
       "views/query-viewer/query-viewer.config.js",
       "views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",
       "views/query-viewer/query-viewer.js",
       "views/query-viewer/query-viewer.model.js",
       "views/query-viewer/query-viewer.service.js",
       "views/query-viewer/result-style.converter.js",
       "views/query-viewer/result-value.converter.js"
     ],
     "aurelia.js": [
       "github:github/fetch@1.0.0.js",
       "github:github/fetch@1.0.0/fetch.js",
       "npm:aurelia-binding@1.0.9.js",
       "npm:aurelia-binding@1.0.9/aurelia-binding.js",
       "npm:aurelia-bootstrapper@1.0.0.js",
       "npm:aurelia-bootstrapper@1.0.0/aurelia-bootstrapper.js",
       "npm:aurelia-dependency-injection@1.3.1.js",
       "npm:aurelia-dependency-injection@1.3.1/aurelia-dependency-injection.js",
       "npm:aurelia-event-aggregator@1.0.1.js",
       "npm:aurelia-event-aggregator@1.0.1/aurelia-event-aggregator.js",
       "npm:aurelia-fetch-client@1.0.1.js",
       "npm:aurelia-fetch-client@1.0.1/aurelia-fetch-client.js",
       "npm:aurelia-framework@1.0.6.js",
       "npm:aurelia-framework@1.0.6/aurelia-framework.js",
       "npm:aurelia-history-browser@1.0.0.js",
       "npm:aurelia-history-browser@1.0.0/aurelia-history-browser.js",
       "npm:aurelia-history@1.0.0.js",
       "npm:aurelia-history@1.0.0/aurelia-history.js",
       "npm:aurelia-loader-default@1.0.0.js",
       "npm:aurelia-loader-default@1.0.0/aurelia-loader-default.js",
       "npm:aurelia-loader@1.0.0.js",
       "npm:aurelia-loader@1.0.0/aurelia-loader.js",
       "npm:aurelia-logging-console@1.0.0.js",
       "npm:aurelia-logging-console@1.0.0/aurelia-logging-console.js",
       "npm:aurelia-logging@1.3.1.js",
       "npm:aurelia-logging@1.3.1/aurelia-logging.js",
       "npm:aurelia-metadata@1.0.3.js",
       "npm:aurelia-metadata@1.0.3/aurelia-metadata.js",
       "npm:aurelia-pal-browser@1.0.0.js",
       "npm:aurelia-pal-browser@1.0.0/aurelia-pal-browser.js",
       "npm:aurelia-pal@1.3.0.js",
       "npm:aurelia-pal@1.3.0/aurelia-pal.js",
       "npm:aurelia-path@1.1.1.js",
       "npm:aurelia-path@1.1.1/aurelia-path.js",
       "npm:aurelia-polyfills@1.1.1.js",
       "npm:aurelia-polyfills@1.1.1/aurelia-polyfills.js",
       "npm:aurelia-route-recognizer@1.1.0.js",
       "npm:aurelia-route-recognizer@1.1.0/aurelia-route-recognizer.js",
       "npm:aurelia-router@1.3.0.js",
       "npm:aurelia-router@1.3.0/aurelia-router.js",
       "npm:aurelia-task-queue@1.1.0.js",
       "npm:aurelia-task-queue@1.1.0/aurelia-task-queue.js",
       "npm:aurelia-templating-binding@1.0.0.js",
       "npm:aurelia-templating-binding@1.0.0/aurelia-templating-binding.js",
       "npm:aurelia-templating-resources@1.1.1.js",
       "npm:aurelia-templating-resources@1.1.1/abstract-repeater.js",
       "npm:aurelia-templating-resources@1.1.1/analyze-view-factory.js",
       "npm:aurelia-templating-resources@1.1.1/array-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/attr-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/aurelia-hide-style.js",
       "npm:aurelia-templating-resources@1.1.1/aurelia-templating-resources.js",
       "npm:aurelia-templating-resources@1.1.1/binding-mode-behaviors.js",
       "npm:aurelia-templating-resources@1.1.1/binding-signaler.js",
       "npm:aurelia-templating-resources@1.1.1/compose.js",
       "npm:aurelia-templating-resources@1.1.1/css-resource.js",
       "npm:aurelia-templating-resources@1.1.1/debounce-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/dynamic-element.js",
       "npm:aurelia-templating-resources@1.1.1/focus.js",
       "npm:aurelia-templating-resources@1.1.1/hide.js",
       "npm:aurelia-templating-resources@1.1.1/html-resource-plugin.js",
       "npm:aurelia-templating-resources@1.1.1/html-sanitizer.js",
       "npm:aurelia-templating-resources@1.1.1/if.js",
       "npm:aurelia-templating-resources@1.1.1/map-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/null-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/number-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/repeat-strategy-locator.js",
       "npm:aurelia-templating-resources@1.1.1/repeat-utilities.js",
       "npm:aurelia-templating-resources@1.1.1/repeat.js",
       "npm:aurelia-templating-resources@1.1.1/replaceable.js",
       "npm:aurelia-templating-resources@1.1.1/sanitize-html.js",
       "npm:aurelia-templating-resources@1.1.1/set-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/show.js",
       "npm:aurelia-templating-resources@1.1.1/signal-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/throttle-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/update-trigger-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/with.js",
       "npm:aurelia-templating-router@1.0.0.js",
       "npm:aurelia-templating-router@1.0.0/aurelia-templating-router.js",
       "npm:aurelia-templating-router@1.0.0/route-href.js",
       "npm:aurelia-templating-router@1.0.0/route-loader.js",
       "npm:aurelia-templating-router@1.0.0/router-view.js",
       "npm:aurelia-templating@1.1.1.js",
       "npm:aurelia-templating@1.1.1/aurelia-templating.js",
       "npm:font-awesome@4.7.0.js",
       "npm:font-awesome@4.7.0/css/font-awesome.css!github:systemjs/plugin-css@0.1.33.js",
       "npm:jquery@2.2.4.js",
       "npm:jquery@2.2.4/dist/jquery.js"
     ]
+  },
+  depCache: {
+    "repository/qep.repository.js": [
+      "aurelia-framework",
+      "aurelia-fetch-client",
+      "fetch"
+    ],
+    "views/mailto/mailto.js": [
+      "aurelia-framework",
+      "views/mailto/mailto.service",
+      "views/mailto/mailto.config"
+    ],
+    "views/mailto/mailto.service.js": [
+      "aurelia-framework",
+      "repository/qep.repository"
+    ],
+    "views/query-viewer/context-menu/context-menu.js": [
+      "aurelia-framework",
+      "common/i2b2.service.js"
+    ],
+    "views/query-viewer/loading-bar/loading-bar.js": [
+      "aurelia-framework"
+    ],
+    "views/query-viewer/query-viewer.js": [
+      "aurelia-framework",
+      "views/query-viewer/query-viewer.service",
+      "common/i2b2.service.js",
+      "./query-viewer.model"
+    ],
+    "views/query-viewer/query-viewer.service.js": [
+      "aurelia-framework",
+      "repository/qep.repository",
+      "./query-viewer.config"
+    ]
   }
 });
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js b/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
index 838cfa4e0..ceb68f873 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/app-build.js
@@ -1 +1 @@
-"bundle";System.register("main.js",[],function(a,b){"use strict";function c(a){a.use.standardConfiguration().developmentLogging(),a.start().then(function(){return a.setRoot("shell")})}return a("configure",c),{setters:[],execute:function(){}}}),function(){var a=System.amdDefine;a("shell.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return"<template><router-view></router-view></template>"})}(),System.register("shell.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("Shell",d=function(){function a(){c(this,a)}return a.prototype.configureRouter=function(a,b){a.title="SHRINE Webclient Plugin",a.map([{route:"mailto",moduleId:"views/mailto/mailto"},{route:["","query-viewer"],moduleId:"views/query-viewer/query-viewer"}]),this.router=b},a}()),a("Shell",d)}}}),function(){var a=System.amdDefine;a("views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="mailto"><div class="content"><p>If you have questions about your query results or this SHRINE network, contact the Data Steward at your site.</p><div class="email js-email"><button class="button button--large js-button" click.delegate="openEmail()">Email Data Steward</button></div></div></div></template>'})}(),System.register("views/mailto/mailto.service.js",["aurelia-framework","repository/qep.repository"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository}],execute:function(){a("MailToService",(f=d(e),h=f(g=function(){function a(b){c(this,a),this.repository=b}return a.prototype.fetchStewardEmail=function(){return this.repository.fetchStewardEmail()},a}())||g)),a("MailToService",h)}}}),System.register("views/mailto/mailto.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("MailConfig",c={mailto:"mailto:",subject:"subject="+encodeURIComponent("Question from a SHRINE User"),body:encodeURIComponent("Please enter the suggested information and your question. Your data steward will reply to this email.\n\n***Never send patient information, passwords, or other sensitive information by email****\nName:\nTitle:\nUser name (to log into SHRINE):\nTelephone Number (optional):\nPreferred email address (optional):\n\nQuestion or Comment:")}),a("MailConfig",c)}}}),System.register("views/mailto/mailto.js",["aurelia-framework","views/mailto/mailto.service","views/mailto/mailto.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.MailToService},function(a){f=a.MailConfig}],execute:function(){a("MailTo",(g=d(e,f),i=g(h=function(){function a(b,d){c(this,a),this.service=b,this.config=d}return a.prototype.openEmail=function(){var a=this;this.service.fetchStewardEmail().then(function(b){return window.top.location=a.getComposition(b),a})},a.prototype.getComposition=function(a){return this.config.mailto+a+"?"+this.config.subject+"&"+this.config.body},a}())||h)),a("MailTo",i)}}}),System.register("views/query-viewer/box-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("BoxStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return"transform: translate("+String(-100*a)+"%);"},a}()),a("BoxStyleValueConverter",d)}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li click.delegate="loadQuery(context.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><!--li><a href="#"><i class="fa fa-pencil"></i> Rename</a></li--><li><a href="#"><i class="fa fa-history"></i> Refresh All</a></li><!--li><a href="#"><i class="fa fa-bookmark"></i> Flag</a></li--><!--li><a href="#"><i class="fa fa-bookmark-o"></i> Unflag</a></li--></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","common/i2b2.service.js"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.inject,g=a.bindable},function(a){h=a.I2B2Service}],execute:function(){a("ContextMenu",(i=f(h),m=i((k=function b(a){var e=this;d(this,b),c(this,"context",l,this),this.loadQuery=function(b){a.loadQuery(b),e.context["class"]="hide"}},l=e(k.prototype,"context",[g],{enumerable:!0,initializer:null}),j=k))||j)),a("ContextMenu",m)}}}),function(){var a=System.amdDefine;a("views/query-viewer/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><ul class="circle-pagination" if.bind="showCircles"><li repeat.for="screen of screens" class="${screenIndex === $index? \'active\' : \'\'}" click.delegate="screenIndex = $index"><div>${screen.id}</div></li></ul></div><div class="box-wrapper"><div class="box" repeat.for="screen of screens" css.bind="screenIndex | boxStyle"><section><div><table cellpadding="0" cellspacing="0" border="0"><thead><tr><th class="tbl-header"></th><th repeat.for="node of screen.nodes" class="tbl-header"><div class="hideextra">${node}</div></th></tr></thead></table></div><context-menu context.bind="context"></context-menu><div class="tbl-content ${vertStyle}"><table cellpadding="0" cellspacing="0" border="0"><tbody><tr repeat.for="result of screen.results" contextmenu.trigger="context = getContext($event, result)"><th><div class="hideextra">${result.name}</div></th><td repeat.for="nodeResult of result.nodeResults" css="${nodeResult | resultStyle}">${nodeResult | result}</td></tr></tbody></table></div></section></div></div></template>'})}(),System.register("repository/qep.repository.js",["aurelia-framework","aurelia-fetch-client","fetch"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.HttpClient},function(a){}],execute:function(){f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("QEPRepository",(g=d(e),i=g(h=function(){function a(b){var d=this;c(this,a),b.configure(function(a){a.useStandardConfiguration().withBaseUrl(d.url).withDefaults({headers:{Authorization:"Basic "+d.auth}})}),this.http=b}return a.prototype.fetchPreviousQueries=function(){return this.http.fetch("qep/queryResults").then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchStewardEmail=function(){return this.http.fetch("data?key=stewardEmail").then(function(a){return a.json()}).then(function(a){return a.indexOf('"')>0?a.split('"')[1]:a})["catch"](function(){return""})},f(a,[{key:"url",get:function(){var a=document.URL,b=":6443/shrine-metadata/";return a.substring(0,a.lastIndexOf(":"))+b}},{key:"auth",get:function(){var a=sessionStorage.getItem("shrine.auth");return sessionStorage.removeItem("shrine.auth"),a}}]),a}())||h)),a("QEPRepository",i)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10}),a("QueryViewerConfig",c)}}}),System.register("views/query-viewer/query-viewer.service.js",["aurelia-framework","repository/qep.repository","./query-viewer.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository},function(a){f=a.QueryViewerConfig}],execute:function(){a("QueryViewerService",(g=d(e,f),i=g(h=function(){function a(b,d,e){c(this,a),this.repository=b,this.config=d}return a.prototype.fetchPreviousQueries=function(){return this.repository.fetchPreviousQueries()},a.prototype.getScreens=function(a,b){var c=this;return new Promise(function(d,e){for(var f=a.sort().length,g=[],h=0;h<f;h+=c.config.maxNodesPerScreen){var i=c.getNumberOfNodesOnScreen(a,h,c.config.maxNodesPerScreen),j=i-1,k=c.getScreenId(a,h,j),l=a.slice(h,i),m=c.mapQueriesToScreenNodes(l,b,c.findQueriesForNode);g.push({id:k,nodes:l,results:m})}d(g)})},a.prototype.mapQueriesToScreenNodes=function(a,b){var c=[];return b.forEach(function(b,d){var e={name:b.query.queryName,id:b.query.networkId,nodeResults:[]};a.forEach(function(a){e.nodeResults.push(b.adaptersToResults.find(function(b){return b.adapterNode===a}))}),c.push(e)}),c},a.prototype.getNumberOfNodesOnScreen=function(a,b){var c=b+this.config.maxNodesPerScreen;return c<a.length?c:a.length},a.prototype.getScreenId=function(a,b,c){var d=a[b],e=a[c];return String(d).substr(0,1)+"-"+String(e).substr(0,1)},a}())||h)),a("QueryViewerService",i)}}}),System.register("common/i2b2.service.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g;return{setters:[],execute:function(){a("I2B2Service",d=function b(){var a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:window;c(this,b);var d=e(a,"i2b2");this.onResize=function(a){return d?d.events.changedZoomWindows.subscribe(a):null},this.onHistory=function(a){return d?d.CRC.ctrlr.history.events.onDataUpdate.subscribe(a):null},this.loadQuery=function(a){return d?d.CRC.ctrlr.QT.doQueryLoad(a):null}}),a("I2B2Service",d),e=function(a,b){return g(a)?f(a)[b]:null},f=function(a){return a.parent.window},g=function(a){return a&&a.parent&&a.parent.window}}}}),System.register("views/query-viewer/query-viewer.model.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("QueryViewerModel",d=function b(){c(this,b),this.isLoaded=!1,this.screens=[]}),a("QueryViewerModel",d)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-framework","views/query-viewer/query-viewer.service","common/i2b2.service.js","./query-viewer.model"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.inject,e=a.computedFrom},function(a){f=a.QueryViewerService},function(a){g=a.I2B2Service},function(a){h=a.QueryViewerModel}],execute:function(){a("QueryViewer",(i=d(f,g,h),k=i(j=function(){function a(b,d,e){var f=this;c(this,a),this.screenIndex=0,this.showCircles=!1,this.showLoader=!0,this.service=b,this.vertStyle="v-min";var g=function(a){return f.service.getScreens(a.adapters,a.queryResults)},h=function(a){f.showLoader=!1,f.screens=a,f.showCircles=f.screens.length>1,e.screens=a,e.isLoaded=!0},i=function(){return f.service.fetchPreviousQueries().then(g).then(h)["catch"](function(a){return console.log(a)})},j=function(){return e.isLoaded?h(e.screens):i()},k=function(a){return"ADD"!==a.action},l=function(a,b){return f.vertStyle=b.find(k)?"v-min":"v-full"};d.onResize(l),d.onHistory(i),j()}return a.prototype.getContext=function(a,b){return{x:a.pageX,y:a.pageY,id:b.id,"class":"show"}},a}())||j)),a("QueryViewer",k)}}}),System.register("views/query-viewer/result-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=this.isUnresolved(a)?"color:"+this.getColorValue(a):"";return b},a.prototype.isUnresolved=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"FINISHED";return!a||a.status!==b},a.prototype.getColorValue=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"ERROR",c=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"#FF0000",d=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"#00FF00";return a&&a.status!==b?d:c},a}()),a("ResultStyleValueConverter",d)}}}),System.register("views/query-viewer/result-value.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a?"FINISHED"!==a.status?a.status:a.count<0?"<=10":a.count:"not available"},a}()),a("ResultValueConverter",d)}}});
\ No newline at end of file
+"bundle";System.register("main.js",[],function(a,b){"use strict";function c(a){a.use.standardConfiguration().developmentLogging(),a.start().then(function(){return a.setRoot("shell")})}return a("configure",c),{setters:[],execute:function(){}}}),function(){var a=System.amdDefine;a("shell.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return"<template><router-view></router-view></template>"})}(),System.register("shell.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("Shell",d=function(){function a(){c(this,a)}return a.prototype.configureRouter=function(a,b){a.title="SHRINE Webclient Plugin",a.map([{route:"mailto",moduleId:"views/mailto/mailto"},{route:["","query-viewer"],moduleId:"views/query-viewer/query-viewer"}]),this.router=b},a}()),a("Shell",d)}}}),function(){var a=System.amdDefine;a("views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="mailto"><div class="content"><p>If you have questions about your query results or this SHRINE network, contact the Data Steward at your site.</p><div class="email js-email"><button class="button button--large js-button" click.delegate="openEmail()">Email Data Steward</button></div></div></div></template>'})}(),System.register("views/mailto/mailto.service.js",["aurelia-framework","repository/qep.repository"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository}],execute:function(){a("MailToService",(f=d(e),h=f(g=function(){function a(b){c(this,a),this.repository=b}return a.prototype.fetchStewardEmail=function(){return this.repository.fetchStewardEmail()},a}())||g)),a("MailToService",h)}}}),System.register("views/mailto/mailto.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("MailConfig",c={mailto:"mailto:",subject:"subject="+encodeURIComponent("Question from a SHRINE User"),body:encodeURIComponent("Please enter the suggested information and your question. Your data steward will reply to this email.\n\n***Never send patient information, passwords, or other sensitive information by email****\nName:\nTitle:\nUser name (to log into SHRINE):\nTelephone Number (optional):\nPreferred email address (optional):\n\nQuestion or Comment:")}),a("MailConfig",c)}}}),System.register("views/mailto/mailto.js",["aurelia-framework","views/mailto/mailto.service","views/mailto/mailto.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.MailToService},function(a){f=a.MailConfig}],execute:function(){a("MailTo",(g=d(e,f),i=g(h=function(){function a(b,d){c(this,a),this.service=b,this.config=d}return a.prototype.openEmail=function(){var a=this;this.service.fetchStewardEmail().then(function(b){return window.top.location=a.getComposition(b),a})},a.prototype.getComposition=function(a){return this.config.mailto+a+"?"+this.config.subject+"&"+this.config.body},a}())||h)),a("MailTo",i)}}}),System.register("views/query-viewer/box-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("BoxStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return"transform: translate("+String(-100*a)+"%);"},a}()),a("BoxStyleValueConverter",d)}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li click.delegate="loadQuery(context.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><li><a click.delegate="loadHistory(context.id)" href="#"><i class="fa fa-history"></i> Refresh All</a></li></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","common/i2b2.service.js"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.inject,g=a.bindable},function(a){h=a.I2B2Service}],execute:function(){a("ContextMenu",(i=f(h),m=i((k=function b(a){var e=this;d(this,b),c(this,"context",l,this),this.loadQuery=function(b){a.loadQuery(b),e.context["class"]="hide"},this.loadHistory=function(){e.context["class"]="hide",a.onHistory()}},l=e(k.prototype,"context",[g],{enumerable:!0,initializer:null}),j=k))||j)),a("ContextMenu",m)}}}),function(){var a=System.amdDefine;a("views/query-viewer/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><ul class="circle-pagination" if.bind="showCircles"><li repeat.for="screen of screens" class="${screenIndex === $index? \'active\' : \'\'}" click.delegate="screenIndex = $index"><div>${screen.id}</div></li></ul></div><div class="box-wrapper"><div class="box" repeat.for="screen of screens" css.bind="screenIndex | boxStyle"><section><div><table cellpadding="0" cellspacing="0" border="0"><thead><tr><th class="tbl-header"></th><th repeat.for="node of screen.nodes" class="tbl-header"><div class="hideextra">${node}</div></th></tr></thead></table></div><context-menu context.bind="context"></context-menu><div class="tbl-content ${vertStyle}"><table cellpadding="0" cellspacing="0" border="0"><tbody><tr repeat.for="result of screen.results" contextmenu.trigger="context = getContext($event, result)"><th><div class="hideextra">${result.name}</div></th><td repeat.for="nodeResult of result.nodeResults" css="${nodeResult | resultStyle}">${nodeResult | result}</td></tr></tbody></table></div></section></div></div></template>'})}(),System.register("repository/qep.repository.js",["aurelia-framework","aurelia-fetch-client","fetch"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.HttpClient},function(a){}],execute:function(){f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("QEPRepository",(g=d(e),i=g(h=function(){function a(b){var d=this;c(this,a),b.configure(function(a){a.useStandardConfiguration().withBaseUrl(d.url).withDefaults({headers:{Authorization:"Basic "+d.auth}})}),this.http=b}return a.prototype.fetchPreviousQueries=function(){return this.http.fetch("qep/queryResults").then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchStewardEmail=function(){return this.http.fetch("data?key=stewardEmail").then(function(a){return a.json()}).then(function(a){return a.indexOf('"')>0?a.split('"')[1]:a})["catch"](function(){return""})},f(a,[{key:"url",get:function(){var a=document.URL,b=":6443/shrine-metadata/";return a.substring(0,a.lastIndexOf(":"))+b}},{key:"auth",get:function(){var a=sessionStorage.getItem("shrine.auth");return sessionStorage.removeItem("shrine.auth"),a}}]),a}())||h)),a("QEPRepository",i)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10}),a("QueryViewerConfig",c)}}}),System.register("views/query-viewer/query-viewer.service.js",["aurelia-framework","repository/qep.repository","./query-viewer.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository},function(a){f=a.QueryViewerConfig}],execute:function(){a("QueryViewerService",(g=d(e,f),i=g(h=function(){function a(b,d,e){c(this,a),this.repository=b,this.config=d}return a.prototype.fetchPreviousQueries=function(){return this.repository.fetchPreviousQueries()},a.prototype.getScreens=function(a,b){var c=this;return new Promise(function(d,e){for(var f=a.sort().length,g=[],h=0;h<f;h+=c.config.maxNodesPerScreen){var i=c.getNumberOfNodesOnScreen(a,h,c.config.maxNodesPerScreen),j=i-1,k=c.getScreenId(a,h,j),l=a.slice(h,i),m=c.mapQueriesToScreenNodes(l,b,c.findQueriesForNode);g.push({id:k,nodes:l,results:m})}d(g)})},a.prototype.mapQueriesToScreenNodes=function(a,b){var c=[];return b.forEach(function(b,d){var e={name:b.query.queryName,id:b.query.networkId,nodeResults:[]};a.forEach(function(a){e.nodeResults.push(b.adaptersToResults.find(function(b){return b.adapterNode===a}))}),c.push(e)}),c},a.prototype.getNumberOfNodesOnScreen=function(a,b){var c=b+this.config.maxNodesPerScreen;return c<a.length?c:a.length},a.prototype.getScreenId=function(a,b,c){var d=a[b],e=a[c];return String(d).substr(0,1)+"-"+String(e).substr(0,1)},a}())||h)),a("QueryViewerService",i)}}}),System.register("common/i2b2.service.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g;return{setters:[],execute:function(){a("I2B2Service",d=function b(){var a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:window;c(this,b);var d=e(a,"i2b2");this.onResize=function(a){return d?d.events.changedZoomWindows.subscribe(a):null},this.onHistory=d?d.CRC.view.history.doRefreshAll:null,this.loadQuery=function(a){return d?d.CRC.ctrlr.QT.doQueryLoad(a):null}}),a("I2B2Service",d),e=function(a,b){return g(a)?f(a)[b]:null},f=function(a){return a.parent.window},g=function(a){return a&&a.parent&&a.parent.window}}}}),System.register("views/query-viewer/query-viewer.model.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("QueryViewerModel",d=function b(){c(this,b),this.isLoaded=!1,this.screens=[]}),a("QueryViewerModel",d)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-framework","views/query-viewer/query-viewer.service","common/i2b2.service.js","./query-viewer.model"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.inject,e=a.computedFrom},function(a){f=a.QueryViewerService},function(a){g=a.I2B2Service},function(a){h=a.QueryViewerModel}],execute:function(){a("QueryViewer",(i=d(f,g,h),k=i(j=function(){function a(b,d,e){var f=this;c(this,a),this.screenIndex=0,this.showCircles=!1,this.showLoader=!0,this.service=b,this.vertStyle="v-min";var g=function(a){return f.service.getScreens(a.adapters,a.queryResults)},h=function(a){f.showLoader=!1,f.screens=a,f.showCircles=f.screens.length>1,e.screens=a,e.isLoaded=!0},i=function(){return f.service.fetchPreviousQueries().then(g).then(h)["catch"](function(a){return console.log(a)})},j=function(){return e.isLoaded?h(e.screens):i()},k=function(a){return"ADD"!==a.action},l=function(a,b){return f.vertStyle=b.find(k)?"v-min":"v-full"};d.onResize(l),d.onHistory(i),j()}return a.prototype.getContext=function(a,b){return{x:a.pageX,y:a.pageY,id:b.id,"class":"show"}},a}())||j)),a("QueryViewer",k)}}}),System.register("views/query-viewer/result-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=this.isUnresolved(a)?"color:"+this.getColorValue(a):"";return b},a.prototype.isUnresolved=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"FINISHED";return!a||a.status!==b},a.prototype.getColorValue=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"ERROR",c=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"#FF0000",d=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"#00FF00";return a&&a.status!==b?d:c},a}()),a("ResultStyleValueConverter",d)}}}),System.register("views/query-viewer/result-value.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a?"FINISHED"!==a.status?a.status:a.count<0?"<=10":a.count:"not available"},a}()),a("ResultValueConverter",d)}}});
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js b/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js
index 93a2c13fc..7b5f090f6 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js
@@ -1,48 +1,46 @@
 System.register([], function (_export, _context) {
     "use strict";
 
     var I2B2Service, getLib, getParent, hasParent;
 
     function _classCallCheck(instance, Constructor) {
         if (!(instance instanceof Constructor)) {
             throw new TypeError("Cannot call a class as a function");
         }
     }
 
     return {
         setters: [],
         execute: function () {
             _export('I2B2Service', I2B2Service = function I2B2Service() {
                 var context = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : window;
 
                 _classCallCheck(this, I2B2Service);
 
                 var i2b2 = getLib(context, 'i2b2');
                 this.onResize = function (f) {
                     return i2b2 ? i2b2.events.changedZoomWindows.subscribe(f) : null;
                 };
-                this.onHistory = function (f) {
-                    return i2b2 ? i2b2.CRC.ctrlr.history.events.onDataUpdate.subscribe(f) : null;
-                };
+                this.onHistory = i2b2 ? i2b2.CRC.view.history.doRefreshAll : null;
                 this.loadQuery = function (id) {
                     return i2b2 ? i2b2.CRC.ctrlr.QT.doQueryLoad(id) : null;
                 };
             });
 
             _export('I2B2Service', I2B2Service);
 
             getLib = function getLib(context, lib) {
                 return hasParent(context) ? getParent(context)[lib] : null;
             };
 
             getParent = function getParent(context) {
                 return context.parent.window;
             };
 
             hasParent = function hasParent(context) {
                 return context && context.parent && context.parent.window;
             };
         }
     };
 });
 //# sourceMappingURL=i2b2.service.js.map
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js.map b/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js.map
index 09003df8e..d6217b4c2 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js.map
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/common/i2b2.service.js.map
@@ -1 +1 @@
-{"version":3,"sources":["common/i2b2.service.js"],"names":["I2B2Service","context","window","i2b2","getLib","onResize","events","changedZoomWindows","subscribe","f","onHistory","CRC","ctrlr","history","onDataUpdate","loadQuery","QT","doQueryLoad","id","lib","hasParent","getParent","parent"],"mappings":";;;;;;;;;;;;;;mCAAaA,W,GACT,uBAA8B;AAAA,oBAAlBC,OAAkB,uEAARC,MAAQ;;AAAA;;AAC1B,oBAAMC,OAAOC,OAAOH,OAAP,EAAgB,MAAhB,CAAb;AACA,qBAAKI,QAAL,GAAgB;AAAA,2BAAMF,IAAD,GAASA,KAAKG,MAAL,CAAYC,kBAAZ,CAA+BC,SAA/B,CAAyCC,CAAzC,CAAT,GAAuD,IAA5D;AAAA,iBAAhB;AACA,qBAAKC,SAAL,GAAiB;AAAA,2BAAMP,IAAD,GAAQA,KAAKQ,GAAL,CAASC,KAAT,CAAeC,OAAf,CAAuBP,MAAvB,CAA8BQ,YAA9B,CAA2CN,SAA3C,CAAqDC,CAArD,CAAR,GAAkE,IAAvE;AAAA,iBAAjB;AACA,qBAAKM,SAAL,GAAiB;AAAA,2BAAOZ,IAAD,GAAQA,KAAKQ,GAAL,CAASC,KAAT,CAAeI,EAAf,CAAkBC,WAAlB,CAA8BC,EAA9B,CAAR,GAA6C,IAAnD;AAAA,iBAAjB;AACH,a;;;;AAICd,kB,GAAS,SAATA,MAAS,CAACH,OAAD,EAAUkB,GAAV;AAAA,uBAAkBC,UAAUnB,OAAV,IAAqBoB,UAAUpB,OAAV,EAAmBkB,GAAnB,CAArB,GAA+C,IAAjE;AAAA,a;;AACTE,qB,GAAY,SAAZA,SAAY,CAACpB,OAAD;AAAA,uBAAaA,QAAQqB,MAAR,CAAepB,MAA5B;AAAA,a;;AACZkB,qB,GAAY,SAAZA,SAAY,CAACnB,OAAD;AAAA,uBAAaA,WAAWA,QAAQqB,MAAnB,IAA6BrB,QAAQqB,MAAR,CAAepB,MAAzD;AAAA,a","file":"i2b2.service.js","sourceRoot":"/src"}
\ No newline at end of file
+{"version":3,"sources":["common/i2b2.service.js"],"names":["I2B2Service","context","window","i2b2","getLib","onResize","events","changedZoomWindows","subscribe","f","onHistory","CRC","view","history","doRefreshAll","loadQuery","ctrlr","QT","doQueryLoad","id","lib","hasParent","getParent","parent"],"mappings":";;;;;;;;;;;;;;mCAAaA,W,GACT,uBAA8B;AAAA,oBAAlBC,OAAkB,uEAARC,MAAQ;;AAAA;;AAC1B,oBAAMC,OAAOC,OAAOH,OAAP,EAAgB,MAAhB,CAAb;AACA,qBAAKI,QAAL,GAAgB;AAAA,2BAAMF,IAAD,GAASA,KAAKG,MAAL,CAAYC,kBAAZ,CAA+BC,SAA/B,CAAyCC,CAAzC,CAAT,GAAuD,IAA5D;AAAA,iBAAhB;AACA,qBAAKC,SAAL,GAAkBP,IAAD,GAAQA,KAAKQ,GAAL,CAASC,IAAT,CAAcC,OAAd,CAAsBC,YAA9B,GAA8C,IAA/D;AACA,qBAAKC,SAAL,GAAiB;AAAA,2BAAOZ,IAAD,GAAQA,KAAKQ,GAAL,CAASK,KAAT,CAAeC,EAAf,CAAkBC,WAAlB,CAA8BC,EAA9B,CAAR,GAA6C,IAAnD;AAAA,iBAAjB;AACH,a;;;;AAICf,kB,GAAS,SAATA,MAAS,CAACH,OAAD,EAAUmB,GAAV;AAAA,uBAAkBC,UAAUpB,OAAV,IAAqBqB,UAAUrB,OAAV,EAAmBmB,GAAnB,CAArB,GAA+C,IAAjE;AAAA,a;;AACTE,qB,GAAY,SAAZA,SAAY,CAACrB,OAAD;AAAA,uBAAaA,QAAQsB,MAAR,CAAerB,MAA5B;AAAA,a;;AACZmB,qB,GAAY,SAAZA,SAAY,CAACpB,OAAD;AAAA,uBAAaA,WAAWA,QAAQsB,MAAnB,IAA6BtB,QAAQsB,MAAR,CAAerB,MAAzD;AAAA,a","file":"i2b2.service.js","sourceRoot":"/src"}
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.html b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.html
index 2b0ccd8c2..ca2784fe6 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.html
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.html
@@ -1 +1 @@
-<template><ul class="context-menu ${context.class || 'hide'}" mouseleave.trigger="context.class='hide'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li click.delegate="loadQuery(context.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><!--li><a href="#"><i class="fa fa-pencil"></i> Rename</a></li--><li><a href="#"><i class="fa fa-history"></i> Refresh All</a></li><!--li><a href="#"><i class="fa fa-bookmark"></i> Flag</a></li--><!--li><a href="#"><i class="fa fa-bookmark-o"></i> Unflag</a></li--></ul></template>
\ No newline at end of file
+<template><ul class="context-menu ${context.class || 'hide'}" mouseleave.trigger="context.class='hide'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li click.delegate="loadQuery(context.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><li><a click.delegate="loadHistory(context.id)" href="#"><i class="fa fa-history"></i> Refresh All</a></li></ul></template>
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js
index 25c4986a7..90648135a 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js
@@ -1,83 +1,88 @@
 System.register(['aurelia-framework', 'common/i2b2.service.js'], function (_export, _context) {
     "use strict";
 
     var inject, bindable, I2B2Service, _dec, _class, _desc, _value, _class2, _descriptor, ContextMenu;
 
     function _initDefineProp(target, property, descriptor, context) {
         if (!descriptor) return;
         Object.defineProperty(target, property, {
             enumerable: descriptor.enumerable,
             configurable: descriptor.configurable,
             writable: descriptor.writable,
             value: descriptor.initializer ? descriptor.initializer.call(context) : void 0
         });
     }
 
     function _classCallCheck(instance, Constructor) {
         if (!(instance instanceof Constructor)) {
             throw new TypeError("Cannot call a class as a function");
         }
     }
 
     function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) {
         var desc = {};
         Object['ke' + 'ys'](descriptor).forEach(function (key) {
             desc[key] = descriptor[key];
         });
         desc.enumerable = !!desc.enumerable;
         desc.configurable = !!desc.configurable;
 
         if ('value' in desc || desc.initializer) {
             desc.writable = true;
         }
 
         desc = decorators.slice().reverse().reduce(function (desc, decorator) {
             return decorator(target, property, desc) || desc;
         }, desc);
 
         if (context && desc.initializer !== void 0) {
             desc.value = desc.initializer ? desc.initializer.call(context) : void 0;
             desc.initializer = undefined;
         }
 
         if (desc.initializer === void 0) {
             Object['define' + 'Property'](target, property, desc);
             desc = null;
         }
 
         return desc;
     }
 
     function _initializerWarningHelper(descriptor, context) {
         throw new Error('Decorating class property failed. Please ensure that transform-class-properties is enabled.');
     }
 
     return {
         setters: [function (_aureliaFramework) {
             inject = _aureliaFramework.inject;
             bindable = _aureliaFramework.bindable;
         }, function (_commonI2b2ServiceJs) {
             I2B2Service = _commonI2b2ServiceJs.I2B2Service;
         }],
         execute: function () {
             _export('ContextMenu', ContextMenu = (_dec = inject(I2B2Service), _dec(_class = (_class2 = function ContextMenu(i2b2Svc) {
                 var _this = this;
 
                 _classCallCheck(this, ContextMenu);
 
                 _initDefineProp(this, 'context', _descriptor, this);
 
                 this.loadQuery = function (id) {
                     i2b2Svc.loadQuery(id);
                     _this.context.class = 'hide';
                 };
+
+                this.loadHistory = function () {
+                    _this.context.class = 'hide';
+                    i2b2Svc.onHistory();
+                };
             }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'context', [bindable], {
                 enumerable: true,
                 initializer: null
             })), _class2)) || _class));
 
             _export('ContextMenu', ContextMenu);
         }
     };
 });
 //# sourceMappingURL=context-menu.js.map
diff --git a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js.map b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js.map
index 84a280101..c7971224f 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js.map
+++ b/shrine-webclient/src/main/js/client/js-shrine/dist/views/query-viewer/context-menu/context-menu.js.map
@@ -1 +1 @@
-{"version":3,"sources":["views/query-viewer/context-menu/context-menu.js"],"names":["inject","bindable","I2B2Service","ContextMenu","i2b2Svc","loadQuery","id","context","class"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAQA,kB,qBAAAA,M;AAAQC,oB,qBAAAA,Q;;AACPC,uB,wBAAAA,W;;;mCAGIC,W,WADZH,OAAOE,WAAP,C,2BAIG,qBAAYE,OAAZ,EAAqB;AAAA;;AAAA;;AAAA;;AACjB,qBAAKC,SAAL,GAAiB,cAAM;AACnBD,4BAAQC,SAAR,CAAkBC,EAAlB;AACA,0BAAKC,OAAL,CAAaC,KAAb,GAAqB,MAArB;AACH,iBAHD;AAIH,a,0EAPAP,Q","file":"context-menu.js","sourceRoot":"/src"}
\ No newline at end of file
+{"version":3,"sources":["views/query-viewer/context-menu/context-menu.js"],"names":["inject","bindable","I2B2Service","ContextMenu","i2b2Svc","loadQuery","id","context","class","loadHistory","onHistory"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAQA,kB,qBAAAA,M;AAAQC,oB,qBAAAA,Q;;AACPC,uB,wBAAAA,W;;;mCAGIC,W,WADZH,OAAOE,WAAP,C,2BAIG,qBAAYE,OAAZ,EAAqB;AAAA;;AAAA;;AAAA;;AACjB,qBAAKC,SAAL,GAAiB,cAAM;AACnBD,4BAAQC,SAAR,CAAkBC,EAAlB;AACA,0BAAKC,OAAL,CAAaC,KAAb,GAAqB,MAArB;AACH,iBAHD;;AAKF,qBAAKC,WAAL,GAAmB,YAAM;AACvB,0BAAKF,OAAL,CAAaC,KAAb,GAAqB,MAArB;AACAJ,4BAAQM,SAAR;AACD,iBAHD;AAID,a,0EAZAT,Q","file":"context-menu.js","sourceRoot":"/src"}
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css b/shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css
index 5c6a57033..9e116bad1 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css
+++ b/shrine-webclient/src/main/js/client/js-shrine/export/assets/css/styles.css
@@ -1,258 +1,258 @@
 .mailto {
   box-sizing: border-box;
   display: flex;
   justify-content: center;
   align-items: center;
   width: 100%;
   height: 100%;
   padding: 10px;
   color: #333;
   background: #f2f2f2;
   height: 100% p;
     height-font-size: 16px;
     height-line-height: 1.6em; }
   .mailto .button {
     border: 1px solid #6576a8;
     background: #6d85ad;
     border: 0;
     outline: 0;
     font-weight: bold;
     text-transform: uppercase;
     text-decoration: none;
     letter-spacing: 1px;
     color: #fff;
     cursor: pointer; }
     .mailto .button:hover {
       background: #9cb8d9; }
     .mailto .button:active {
       background: #6576a8; }
   .mailto .button--large {
     position: relative;
     padding: 15px 30px;
     border-radius: 5px;
     font-size: 16px; }
     .mailto .button--large:active {
       top: 1px; }
   .mailto .content {
     max-width: 350px;
     text-align: center; }
   .mailto .email {
     position: relative; }
 
 @import url(http://fonts.googleapis.com/css?family=Roboto:400,500,300,700);
 body {
   overflow: hidden;
   background: rgba(255, 255, 255, 0.9);
   font-family: 'Roboto', sans-serif; }
 
 html,
 body,
 .box-wrapper {
   width: 100%;
   height: 100%;
   margin: 0; }
 
 .box-wrapper {
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
   -webkit-box-orient: vertical;
   -webkit-box-direction: normal;
   -ms-flex-direction: column;
   flex-direction: column;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap; }
 
 .box-wrapper > .box {
   margin-top: 1%;
   width: 100%;
   transition: all .2s ease; }
   .box-wrapper > .box .hideextra {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis; }
   .box-wrapper > .box section {
     margin: 20 0 6 0; }
     .box-wrapper > .box section .v-full {
       height: 90vh; }
     .box-wrapper > .box section .v-full > table {
       padding-bottom: 10%; }
     .box-wrapper > .box section .v-min {
       height: 100px; }
     .box-wrapper > .box section .v-min > table {
       padding-bottom: 1%; }
     .box-wrapper > .box section .tbl-content {
       overflow: auto;
       margin-top: 0px;
       border: 1px solid rgba(98, 108, 146, 0.3); }
   .box-wrapper > .box table {
     width: 100%;
     table-layout: fixed; }
     .box-wrapper > .box table .tbl-header {
       background-color: rgba(98, 108, 146, 0.3); }
       .box-wrapper > .box table .tbl-header div.tbl-header {
         max-width: 5rem; }
     .box-wrapper > .box table tr {
       background: white;
       cursor: pointer; }
       .box-wrapper > .box table tr:hover {
         background: rgba(98, 108, 146, 0.3) !important; }
       .box-wrapper > .box table tr:nth-child(odd) {
         background: rgba(98, 108, 146, 0.1); }
     .box-wrapper > .box table th {
       padding: 2px 4px 4px 2px;
       text-align: left;
       font-weight: 500;
       font-size: .75rem;
       color: #626C92;
       text-transform: uppercase;
       border-bottom: solid 1px rgba(98, 108, 146, 0.1);
       border-left: solid 1px rgba(98, 108, 146, 0.1); }
     .box-wrapper > .box table td {
       transition: all .5s ease;
       padding: 2px;
       text-align: left;
       vertical-align: top;
       font-weight: 300;
       font-size: 12px;
       color: black;
       border-bottom: solid 1px rgba(98, 108, 146, 0.1);
       border-left: solid 1px rgba(98, 108, 146, 0.1); }
 
 .circle-pagination {
   position: absolute;
   z-index: 1000;
   list-style-type: none;
   margin: 0;
   top: -.3rem; }
   .circle-pagination li {
     border-radius: 50%;
     border: 2px solid #626C92;
     width: 12px;
     height: 12px;
     padding: 4px;
     margin: 6px;
     cursor: pointer;
     float: left;
     transition: all .2s ease; }
     .circle-pagination li.active, .circle-pagination li:hover {
       background: #626C92;
       width: 14px;
       height: 14px; }
     .circle-pagination li.active div,
     .circle-pagination li div:hover {
       color: white; }
     .circle-pagination li div {
       font-size: .6rem;
       width: 24px;
       position: relative;
       left: -6px;
       top: 1px;
       color: #626C92;
       font-weight: 600;
       text-transform: capitalize; }
 
+@import url(http://fonts.googleapis.com/css?family=Roboto:400,300&subset=latin,latin-ext);
+ul.context-menu {
+  transition: opacity 0.2s linear;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  font: 200 11px "Roboto", sans-serif;
+  position: absolute;
+  color: #626C92;
+  box-shadow: 0 12px 15px 0 rgba(0, 0, 0, 0.2);
+  border-radius: 5px;
+  border: 1px solid rgba(98, 108, 146, 0.25); }
+  ul.context-menu * {
+    transition: color 0.2s, background 0.2s; }
+  ul.context-menu.hide {
+    visibility: hidden;
+    opacity: 0; }
+  ul.context-menu.show {
+    visibility: visible;
+    opacity: 1; }
+  ul.context-menu li {
+    min-width: 100px;
+    overflow: hidden;
+    white-space: nowrap;
+    padding: 6px 8px;
+    background-color: #fff;
+    border-bottom: 1px solid #ecf0f1; }
+    ul.context-menu li a {
+      color: #626C92;
+      text-decoration: none; }
+    ul.context-menu li:hover {
+      background-color: #ecf0f1;
+      color: #2980b9; }
+      ul.context-menu li:hover a {
+        color: #2980b9; }
+    ul.context-menu li:first-child {
+      border-radius: 5px 5px 0 0; }
+    ul.context-menu li:last-child {
+      border-bottom: 0;
+      border-radius: 0 0 5px 5px; }
+
 @import url(http://fonts.googleapis.com/css?family=Roboto:400,300&subset=latin,latin-ext);
 .loader {
   background: #fff;
   margin: 50px 300px;
   /*todo cleanup with mixin*/ }
   .loader h1 {
     color: #626C92;
     font: 300 11px "Roboto", sans-serif; }
   .loader div.slider {
     position: absolute;
     width: 200px;
     height: 2px;
     margin-top: -30px; }
     .loader div.slider div.line {
       position: absolute;
       background: rgba(0, 0, 0, 0.2);
       width: 200px;
       height: 2px; }
     .loader div.slider div.break {
       position: absolute;
       width: 50%;
       height: 2px; }
     .loader div.slider div.break.dot1 {
       animation: loading 2s infinite;
       background: #D9ECF0; }
     .loader div.slider div.break.dot2 {
       animation: loading 2s 0.5s infinite;
       background: #6677AA; }
     .loader div.slider div.break.dot3 {
       animation: loading 2s 1s infinite;
       background: #D9ECF0; }
 
 @-webkit-keyframes "loading" {
   from {
     left: 0;
     opacity: 1; }
   to {
     left: 200px;
     opacity: 1; } }
 
 @-moz-keyframes "loading" {
   from {
     left: 0;
     opacity: 0; }
   to {
     left: 200px;
     opacity: 1; } }
 
 @-o-keyframes "loading" {
   from {
     left: 0;
     opacity: 0; }
   to {
     left: 200px;
     opacity: 1; } }
 
 @keyframes "loading" {
   from {
     left: 0;
     opacity: 0; }
   to {
     left: 200px;
     opacity: 1; } }
-
-@import url(http://fonts.googleapis.com/css?family=Roboto:400,300&subset=latin,latin-ext);
-ul.context-menu {
-  transition: opacity 0.2s linear;
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  font: 200 11px "Roboto", sans-serif;
-  position: absolute;
-  color: #626C92;
-  box-shadow: 0 12px 15px 0 rgba(0, 0, 0, 0.2);
-  border-radius: 5px;
-  border: 1px solid rgba(98, 108, 146, 0.25); }
-  ul.context-menu * {
-    transition: color 0.2s, background 0.2s; }
-  ul.context-menu.hide {
-    visibility: hidden;
-    opacity: 0; }
-  ul.context-menu.show {
-    visibility: visible;
-    opacity: 1; }
-  ul.context-menu li {
-    min-width: 100px;
-    overflow: hidden;
-    white-space: nowrap;
-    padding: 6px 8px;
-    background-color: #fff;
-    border-bottom: 1px solid #ecf0f1; }
-    ul.context-menu li a {
-      color: #626C92;
-      text-decoration: none; }
-    ul.context-menu li:hover {
-      background-color: #ecf0f1;
-      color: #2980b9; }
-      ul.context-menu li:hover a {
-        color: #2980b9; }
-    ul.context-menu li:first-child {
-      border-radius: 5px 5px 0 0; }
-    ul.context-menu li:last-child {
-      border-bottom: 0;
-      border-radius: 0 0 5px 5px; }
diff --git a/shrine-webclient/src/main/js/client/js-shrine/export/config.js b/shrine-webclient/src/main/js/client/js-shrine/export/config.js
index c08fa4341..3666b4201 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/export/config.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/export/config.js
@@ -1,350 +1,350 @@
 System.config({
   defaultJSExtensions: true,
   transpiler: false,
   paths: {
     "*": "dist/*",
     "github:*": "jspm_packages/github/*",
     "npm:*": "jspm_packages/npm/*"
   },
   map: {
     "aurelia-animator-css": "npm:aurelia-animator-css@1.0.1",
     "aurelia-bootstrapper": "npm:aurelia-bootstrapper@1.0.0",
     "aurelia-fetch-client": "npm:aurelia-fetch-client@1.0.1",
     "aurelia-framework": "npm:aurelia-framework@1.0.6",
     "aurelia-history-browser": "npm:aurelia-history-browser@1.0.0",
     "aurelia-loader-default": "npm:aurelia-loader-default@1.0.0",
     "aurelia-logging-console": "npm:aurelia-logging-console@1.0.0",
     "aurelia-pal-browser": "npm:aurelia-pal-browser@1.0.0",
     "aurelia-polyfills": "npm:aurelia-polyfills@1.1.1",
     "aurelia-router": "npm:aurelia-router@1.3.0",
     "aurelia-templating-binding": "npm:aurelia-templating-binding@1.0.0",
     "aurelia-templating-resources": "npm:aurelia-templating-resources@1.1.1",
     "aurelia-templating-router": "npm:aurelia-templating-router@1.0.0",
     "bluebird": "npm:bluebird@3.4.1",
     "bootstrap": "github:twbs/bootstrap@3.3.7",
     "fetch": "github:github/fetch@1.0.0",
     "font-awesome": "npm:font-awesome@4.7.0",
     "jquery": "npm:jquery@2.2.4",
     "text": "github:systemjs/plugin-text@0.0.8",
     "github:jspm/nodelibs-assert@0.1.0": {
       "assert": "npm:assert@1.4.1"
     },
     "github:jspm/nodelibs-buffer@0.1.0": {
       "buffer": "npm:buffer@3.6.0"
     },
     "github:jspm/nodelibs-process@0.1.2": {
       "process": "npm:process@0.11.9"
     },
     "github:jspm/nodelibs-util@0.1.0": {
       "util": "npm:util@0.10.3"
     },
     "github:jspm/nodelibs-vm@0.1.0": {
       "vm-browserify": "npm:vm-browserify@0.0.4"
     },
     "github:twbs/bootstrap@3.3.7": {
       "jquery": "npm:jquery@2.2.4"
     },
     "npm:assert@1.4.1": {
       "assert": "github:jspm/nodelibs-assert@0.1.0",
       "buffer": "github:jspm/nodelibs-buffer@0.1.0",
       "process": "github:jspm/nodelibs-process@0.1.2",
       "util": "npm:util@0.10.3"
     },
     "npm:aurelia-animator-css@1.0.1": {
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-binding@1.0.9": {
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0"
     },
     "npm:aurelia-bootstrapper@1.0.0": {
       "aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.1",
       "aurelia-framework": "npm:aurelia-framework@1.0.6",
       "aurelia-history": "npm:aurelia-history@1.0.0",
       "aurelia-history-browser": "npm:aurelia-history-browser@1.0.0",
       "aurelia-loader-default": "npm:aurelia-loader-default@1.0.0",
       "aurelia-logging-console": "npm:aurelia-logging-console@1.0.0",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-pal-browser": "npm:aurelia-pal-browser@1.0.0",
       "aurelia-polyfills": "npm:aurelia-polyfills@1.1.1",
       "aurelia-router": "npm:aurelia-router@1.3.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1",
       "aurelia-templating-binding": "npm:aurelia-templating-binding@1.0.0",
       "aurelia-templating-resources": "npm:aurelia-templating-resources@1.1.1",
       "aurelia-templating-router": "npm:aurelia-templating-router@1.0.0"
     },
     "npm:aurelia-dependency-injection@1.3.1": {
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-event-aggregator@1.0.1": {
       "aurelia-logging": "npm:aurelia-logging@1.3.1"
     },
     "npm:aurelia-framework@1.0.6": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-history-browser@1.0.0": {
       "aurelia-history": "npm:aurelia-history@1.0.0",
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-loader-default@1.0.0": {
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-loader@1.0.0": {
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-path": "npm:aurelia-path@1.1.1"
     },
     "npm:aurelia-logging-console@1.0.0": {
       "aurelia-logging": "npm:aurelia-logging@1.3.1"
     },
     "npm:aurelia-metadata@1.0.3": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-pal-browser@1.0.0": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-polyfills@1.1.1": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-route-recognizer@1.1.0": {
       "aurelia-path": "npm:aurelia-path@1.1.1"
     },
     "npm:aurelia-router@1.3.0": {
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-event-aggregator": "npm:aurelia-event-aggregator@1.0.1",
       "aurelia-history": "npm:aurelia-history@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-route-recognizer": "npm:aurelia-route-recognizer@1.1.0"
     },
     "npm:aurelia-task-queue@1.1.0": {
       "aurelia-pal": "npm:aurelia-pal@1.3.0"
     },
     "npm:aurelia-templating-binding@1.0.0": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-templating-resources@1.1.1": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-templating-router@1.0.0": {
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-router": "npm:aurelia-router@1.3.0",
       "aurelia-templating": "npm:aurelia-templating@1.1.1"
     },
     "npm:aurelia-templating@1.1.1": {
       "aurelia-binding": "npm:aurelia-binding@1.0.9",
       "aurelia-dependency-injection": "npm:aurelia-dependency-injection@1.3.1",
       "aurelia-loader": "npm:aurelia-loader@1.0.0",
       "aurelia-logging": "npm:aurelia-logging@1.3.1",
       "aurelia-metadata": "npm:aurelia-metadata@1.0.3",
       "aurelia-pal": "npm:aurelia-pal@1.3.0",
       "aurelia-path": "npm:aurelia-path@1.1.1",
       "aurelia-task-queue": "npm:aurelia-task-queue@1.1.0"
     },
     "npm:bluebird@3.4.1": {
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:buffer@3.6.0": {
       "base64-js": "npm:base64-js@0.0.8",
       "child_process": "github:jspm/nodelibs-child_process@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "ieee754": "npm:ieee754@1.1.8",
       "isarray": "npm:isarray@1.0.0",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:font-awesome@4.7.0": {
       "css": "github:systemjs/plugin-css@0.1.33"
     },
     "npm:inherits@2.0.1": {
       "util": "github:jspm/nodelibs-util@0.1.0"
     },
     "npm:process@0.11.9": {
       "assert": "github:jspm/nodelibs-assert@0.1.0",
       "fs": "github:jspm/nodelibs-fs@0.1.2",
       "vm": "github:jspm/nodelibs-vm@0.1.0"
     },
     "npm:util@0.10.3": {
       "inherits": "npm:inherits@2.0.1",
       "process": "github:jspm/nodelibs-process@0.1.2"
     },
     "npm:vm-browserify@0.0.4": {
       "indexof": "npm:indexof@0.0.1"
     }
   },
-  depCache: {
-    "repository/qep.repository.js": [
-      "aurelia-framework",
-      "aurelia-fetch-client",
-      "fetch"
-    ],
-    "views/mailto/mailto.js": [
-      "aurelia-framework",
-      "views/mailto/mailto.service",
-      "views/mailto/mailto.config"
-    ],
-    "views/mailto/mailto.service.js": [
-      "aurelia-framework",
-      "repository/qep.repository"
-    ],
-    "views/query-viewer/context-menu/context-menu.js": [
-      "aurelia-framework",
-      "common/i2b2.service.js"
-    ],
-    "views/query-viewer/loading-bar/loading-bar.js": [
-      "aurelia-framework"
-    ],
-    "views/query-viewer/query-viewer.js": [
-      "aurelia-framework",
-      "views/query-viewer/query-viewer.service",
-      "common/i2b2.service.js",
-      "./query-viewer.model"
-    ],
-    "views/query-viewer/query-viewer.service.js": [
-      "aurelia-framework",
-      "repository/qep.repository",
-      "./query-viewer.config"
-    ]
-  },
   bundles: {
     "app-build.js": [
       "common/i2b2.service.js",
       "main.js",
       "repository/qep.repository.js",
       "shell.html!github:systemjs/plugin-text@0.0.8.js",
       "shell.js",
       "views/mailto/mailto.config.js",
       "views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",
       "views/mailto/mailto.js",
       "views/mailto/mailto.service.js",
       "views/query-viewer/box-style.converter.js",
       "views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",
       "views/query-viewer/context-menu/context-menu.js",
       "views/query-viewer/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",
       "views/query-viewer/loading-bar/loading-bar.js",
       "views/query-viewer/query-viewer.config.js",
       "views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",
       "views/query-viewer/query-viewer.js",
       "views/query-viewer/query-viewer.model.js",
       "views/query-viewer/query-viewer.service.js",
       "views/query-viewer/result-style.converter.js",
       "views/query-viewer/result-value.converter.js"
     ],
     "aurelia.js": [
       "github:github/fetch@1.0.0.js",
       "github:github/fetch@1.0.0/fetch.js",
       "npm:aurelia-binding@1.0.9.js",
       "npm:aurelia-binding@1.0.9/aurelia-binding.js",
       "npm:aurelia-bootstrapper@1.0.0.js",
       "npm:aurelia-bootstrapper@1.0.0/aurelia-bootstrapper.js",
       "npm:aurelia-dependency-injection@1.3.1.js",
       "npm:aurelia-dependency-injection@1.3.1/aurelia-dependency-injection.js",
       "npm:aurelia-event-aggregator@1.0.1.js",
       "npm:aurelia-event-aggregator@1.0.1/aurelia-event-aggregator.js",
       "npm:aurelia-fetch-client@1.0.1.js",
       "npm:aurelia-fetch-client@1.0.1/aurelia-fetch-client.js",
       "npm:aurelia-framework@1.0.6.js",
       "npm:aurelia-framework@1.0.6/aurelia-framework.js",
       "npm:aurelia-history-browser@1.0.0.js",
       "npm:aurelia-history-browser@1.0.0/aurelia-history-browser.js",
       "npm:aurelia-history@1.0.0.js",
       "npm:aurelia-history@1.0.0/aurelia-history.js",
       "npm:aurelia-loader-default@1.0.0.js",
       "npm:aurelia-loader-default@1.0.0/aurelia-loader-default.js",
       "npm:aurelia-loader@1.0.0.js",
       "npm:aurelia-loader@1.0.0/aurelia-loader.js",
       "npm:aurelia-logging-console@1.0.0.js",
       "npm:aurelia-logging-console@1.0.0/aurelia-logging-console.js",
       "npm:aurelia-logging@1.3.1.js",
       "npm:aurelia-logging@1.3.1/aurelia-logging.js",
       "npm:aurelia-metadata@1.0.3.js",
       "npm:aurelia-metadata@1.0.3/aurelia-metadata.js",
       "npm:aurelia-pal-browser@1.0.0.js",
       "npm:aurelia-pal-browser@1.0.0/aurelia-pal-browser.js",
       "npm:aurelia-pal@1.3.0.js",
       "npm:aurelia-pal@1.3.0/aurelia-pal.js",
       "npm:aurelia-path@1.1.1.js",
       "npm:aurelia-path@1.1.1/aurelia-path.js",
       "npm:aurelia-polyfills@1.1.1.js",
       "npm:aurelia-polyfills@1.1.1/aurelia-polyfills.js",
       "npm:aurelia-route-recognizer@1.1.0.js",
       "npm:aurelia-route-recognizer@1.1.0/aurelia-route-recognizer.js",
       "npm:aurelia-router@1.3.0.js",
       "npm:aurelia-router@1.3.0/aurelia-router.js",
       "npm:aurelia-task-queue@1.1.0.js",
       "npm:aurelia-task-queue@1.1.0/aurelia-task-queue.js",
       "npm:aurelia-templating-binding@1.0.0.js",
       "npm:aurelia-templating-binding@1.0.0/aurelia-templating-binding.js",
       "npm:aurelia-templating-resources@1.1.1.js",
       "npm:aurelia-templating-resources@1.1.1/abstract-repeater.js",
       "npm:aurelia-templating-resources@1.1.1/analyze-view-factory.js",
       "npm:aurelia-templating-resources@1.1.1/array-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/attr-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/aurelia-hide-style.js",
       "npm:aurelia-templating-resources@1.1.1/aurelia-templating-resources.js",
       "npm:aurelia-templating-resources@1.1.1/binding-mode-behaviors.js",
       "npm:aurelia-templating-resources@1.1.1/binding-signaler.js",
       "npm:aurelia-templating-resources@1.1.1/compose.js",
       "npm:aurelia-templating-resources@1.1.1/css-resource.js",
       "npm:aurelia-templating-resources@1.1.1/debounce-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/dynamic-element.js",
       "npm:aurelia-templating-resources@1.1.1/focus.js",
       "npm:aurelia-templating-resources@1.1.1/hide.js",
       "npm:aurelia-templating-resources@1.1.1/html-resource-plugin.js",
       "npm:aurelia-templating-resources@1.1.1/html-sanitizer.js",
       "npm:aurelia-templating-resources@1.1.1/if.js",
       "npm:aurelia-templating-resources@1.1.1/map-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/null-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/number-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/repeat-strategy-locator.js",
       "npm:aurelia-templating-resources@1.1.1/repeat-utilities.js",
       "npm:aurelia-templating-resources@1.1.1/repeat.js",
       "npm:aurelia-templating-resources@1.1.1/replaceable.js",
       "npm:aurelia-templating-resources@1.1.1/sanitize-html.js",
       "npm:aurelia-templating-resources@1.1.1/set-repeat-strategy.js",
       "npm:aurelia-templating-resources@1.1.1/show.js",
       "npm:aurelia-templating-resources@1.1.1/signal-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/throttle-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/update-trigger-binding-behavior.js",
       "npm:aurelia-templating-resources@1.1.1/with.js",
       "npm:aurelia-templating-router@1.0.0.js",
       "npm:aurelia-templating-router@1.0.0/aurelia-templating-router.js",
       "npm:aurelia-templating-router@1.0.0/route-href.js",
       "npm:aurelia-templating-router@1.0.0/route-loader.js",
       "npm:aurelia-templating-router@1.0.0/router-view.js",
       "npm:aurelia-templating@1.1.1.js",
       "npm:aurelia-templating@1.1.1/aurelia-templating.js",
       "npm:font-awesome@4.7.0.js",
       "npm:font-awesome@4.7.0/css/font-awesome.css!github:systemjs/plugin-css@0.1.33.js",
       "npm:jquery@2.2.4.js",
       "npm:jquery@2.2.4/dist/jquery.js"
     ]
+  },
+  depCache: {
+    "repository/qep.repository.js": [
+      "aurelia-framework",
+      "aurelia-fetch-client",
+      "fetch"
+    ],
+    "views/mailto/mailto.js": [
+      "aurelia-framework",
+      "views/mailto/mailto.service",
+      "views/mailto/mailto.config"
+    ],
+    "views/mailto/mailto.service.js": [
+      "aurelia-framework",
+      "repository/qep.repository"
+    ],
+    "views/query-viewer/context-menu/context-menu.js": [
+      "aurelia-framework",
+      "common/i2b2.service.js"
+    ],
+    "views/query-viewer/loading-bar/loading-bar.js": [
+      "aurelia-framework"
+    ],
+    "views/query-viewer/query-viewer.js": [
+      "aurelia-framework",
+      "views/query-viewer/query-viewer.service",
+      "common/i2b2.service.js",
+      "./query-viewer.model"
+    ],
+    "views/query-viewer/query-viewer.service.js": [
+      "aurelia-framework",
+      "repository/qep.repository",
+      "./query-viewer.config"
+    ]
   }
 });
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js b/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
index 838cfa4e0..ceb68f873 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/export/dist/app-build.js
@@ -1 +1 @@
-"bundle";System.register("main.js",[],function(a,b){"use strict";function c(a){a.use.standardConfiguration().developmentLogging(),a.start().then(function(){return a.setRoot("shell")})}return a("configure",c),{setters:[],execute:function(){}}}),function(){var a=System.amdDefine;a("shell.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return"<template><router-view></router-view></template>"})}(),System.register("shell.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("Shell",d=function(){function a(){c(this,a)}return a.prototype.configureRouter=function(a,b){a.title="SHRINE Webclient Plugin",a.map([{route:"mailto",moduleId:"views/mailto/mailto"},{route:["","query-viewer"],moduleId:"views/query-viewer/query-viewer"}]),this.router=b},a}()),a("Shell",d)}}}),function(){var a=System.amdDefine;a("views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="mailto"><div class="content"><p>If you have questions about your query results or this SHRINE network, contact the Data Steward at your site.</p><div class="email js-email"><button class="button button--large js-button" click.delegate="openEmail()">Email Data Steward</button></div></div></div></template>'})}(),System.register("views/mailto/mailto.service.js",["aurelia-framework","repository/qep.repository"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository}],execute:function(){a("MailToService",(f=d(e),h=f(g=function(){function a(b){c(this,a),this.repository=b}return a.prototype.fetchStewardEmail=function(){return this.repository.fetchStewardEmail()},a}())||g)),a("MailToService",h)}}}),System.register("views/mailto/mailto.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("MailConfig",c={mailto:"mailto:",subject:"subject="+encodeURIComponent("Question from a SHRINE User"),body:encodeURIComponent("Please enter the suggested information and your question. Your data steward will reply to this email.\n\n***Never send patient information, passwords, or other sensitive information by email****\nName:\nTitle:\nUser name (to log into SHRINE):\nTelephone Number (optional):\nPreferred email address (optional):\n\nQuestion or Comment:")}),a("MailConfig",c)}}}),System.register("views/mailto/mailto.js",["aurelia-framework","views/mailto/mailto.service","views/mailto/mailto.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.MailToService},function(a){f=a.MailConfig}],execute:function(){a("MailTo",(g=d(e,f),i=g(h=function(){function a(b,d){c(this,a),this.service=b,this.config=d}return a.prototype.openEmail=function(){var a=this;this.service.fetchStewardEmail().then(function(b){return window.top.location=a.getComposition(b),a})},a.prototype.getComposition=function(a){return this.config.mailto+a+"?"+this.config.subject+"&"+this.config.body},a}())||h)),a("MailTo",i)}}}),System.register("views/query-viewer/box-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("BoxStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return"transform: translate("+String(-100*a)+"%);"},a}()),a("BoxStyleValueConverter",d)}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li click.delegate="loadQuery(context.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><!--li><a href="#"><i class="fa fa-pencil"></i> Rename</a></li--><li><a href="#"><i class="fa fa-history"></i> Refresh All</a></li><!--li><a href="#"><i class="fa fa-bookmark"></i> Flag</a></li--><!--li><a href="#"><i class="fa fa-bookmark-o"></i> Unflag</a></li--></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","common/i2b2.service.js"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.inject,g=a.bindable},function(a){h=a.I2B2Service}],execute:function(){a("ContextMenu",(i=f(h),m=i((k=function b(a){var e=this;d(this,b),c(this,"context",l,this),this.loadQuery=function(b){a.loadQuery(b),e.context["class"]="hide"}},l=e(k.prototype,"context",[g],{enumerable:!0,initializer:null}),j=k))||j)),a("ContextMenu",m)}}}),function(){var a=System.amdDefine;a("views/query-viewer/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><ul class="circle-pagination" if.bind="showCircles"><li repeat.for="screen of screens" class="${screenIndex === $index? \'active\' : \'\'}" click.delegate="screenIndex = $index"><div>${screen.id}</div></li></ul></div><div class="box-wrapper"><div class="box" repeat.for="screen of screens" css.bind="screenIndex | boxStyle"><section><div><table cellpadding="0" cellspacing="0" border="0"><thead><tr><th class="tbl-header"></th><th repeat.for="node of screen.nodes" class="tbl-header"><div class="hideextra">${node}</div></th></tr></thead></table></div><context-menu context.bind="context"></context-menu><div class="tbl-content ${vertStyle}"><table cellpadding="0" cellspacing="0" border="0"><tbody><tr repeat.for="result of screen.results" contextmenu.trigger="context = getContext($event, result)"><th><div class="hideextra">${result.name}</div></th><td repeat.for="nodeResult of result.nodeResults" css="${nodeResult | resultStyle}">${nodeResult | result}</td></tr></tbody></table></div></section></div></div></template>'})}(),System.register("repository/qep.repository.js",["aurelia-framework","aurelia-fetch-client","fetch"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.HttpClient},function(a){}],execute:function(){f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("QEPRepository",(g=d(e),i=g(h=function(){function a(b){var d=this;c(this,a),b.configure(function(a){a.useStandardConfiguration().withBaseUrl(d.url).withDefaults({headers:{Authorization:"Basic "+d.auth}})}),this.http=b}return a.prototype.fetchPreviousQueries=function(){return this.http.fetch("qep/queryResults").then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchStewardEmail=function(){return this.http.fetch("data?key=stewardEmail").then(function(a){return a.json()}).then(function(a){return a.indexOf('"')>0?a.split('"')[1]:a})["catch"](function(){return""})},f(a,[{key:"url",get:function(){var a=document.URL,b=":6443/shrine-metadata/";return a.substring(0,a.lastIndexOf(":"))+b}},{key:"auth",get:function(){var a=sessionStorage.getItem("shrine.auth");return sessionStorage.removeItem("shrine.auth"),a}}]),a}())||h)),a("QEPRepository",i)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10}),a("QueryViewerConfig",c)}}}),System.register("views/query-viewer/query-viewer.service.js",["aurelia-framework","repository/qep.repository","./query-viewer.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository},function(a){f=a.QueryViewerConfig}],execute:function(){a("QueryViewerService",(g=d(e,f),i=g(h=function(){function a(b,d,e){c(this,a),this.repository=b,this.config=d}return a.prototype.fetchPreviousQueries=function(){return this.repository.fetchPreviousQueries()},a.prototype.getScreens=function(a,b){var c=this;return new Promise(function(d,e){for(var f=a.sort().length,g=[],h=0;h<f;h+=c.config.maxNodesPerScreen){var i=c.getNumberOfNodesOnScreen(a,h,c.config.maxNodesPerScreen),j=i-1,k=c.getScreenId(a,h,j),l=a.slice(h,i),m=c.mapQueriesToScreenNodes(l,b,c.findQueriesForNode);g.push({id:k,nodes:l,results:m})}d(g)})},a.prototype.mapQueriesToScreenNodes=function(a,b){var c=[];return b.forEach(function(b,d){var e={name:b.query.queryName,id:b.query.networkId,nodeResults:[]};a.forEach(function(a){e.nodeResults.push(b.adaptersToResults.find(function(b){return b.adapterNode===a}))}),c.push(e)}),c},a.prototype.getNumberOfNodesOnScreen=function(a,b){var c=b+this.config.maxNodesPerScreen;return c<a.length?c:a.length},a.prototype.getScreenId=function(a,b,c){var d=a[b],e=a[c];return String(d).substr(0,1)+"-"+String(e).substr(0,1)},a}())||h)),a("QueryViewerService",i)}}}),System.register("common/i2b2.service.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g;return{setters:[],execute:function(){a("I2B2Service",d=function b(){var a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:window;c(this,b);var d=e(a,"i2b2");this.onResize=function(a){return d?d.events.changedZoomWindows.subscribe(a):null},this.onHistory=function(a){return d?d.CRC.ctrlr.history.events.onDataUpdate.subscribe(a):null},this.loadQuery=function(a){return d?d.CRC.ctrlr.QT.doQueryLoad(a):null}}),a("I2B2Service",d),e=function(a,b){return g(a)?f(a)[b]:null},f=function(a){return a.parent.window},g=function(a){return a&&a.parent&&a.parent.window}}}}),System.register("views/query-viewer/query-viewer.model.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("QueryViewerModel",d=function b(){c(this,b),this.isLoaded=!1,this.screens=[]}),a("QueryViewerModel",d)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-framework","views/query-viewer/query-viewer.service","common/i2b2.service.js","./query-viewer.model"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.inject,e=a.computedFrom},function(a){f=a.QueryViewerService},function(a){g=a.I2B2Service},function(a){h=a.QueryViewerModel}],execute:function(){a("QueryViewer",(i=d(f,g,h),k=i(j=function(){function a(b,d,e){var f=this;c(this,a),this.screenIndex=0,this.showCircles=!1,this.showLoader=!0,this.service=b,this.vertStyle="v-min";var g=function(a){return f.service.getScreens(a.adapters,a.queryResults)},h=function(a){f.showLoader=!1,f.screens=a,f.showCircles=f.screens.length>1,e.screens=a,e.isLoaded=!0},i=function(){return f.service.fetchPreviousQueries().then(g).then(h)["catch"](function(a){return console.log(a)})},j=function(){return e.isLoaded?h(e.screens):i()},k=function(a){return"ADD"!==a.action},l=function(a,b){return f.vertStyle=b.find(k)?"v-min":"v-full"};d.onResize(l),d.onHistory(i),j()}return a.prototype.getContext=function(a,b){return{x:a.pageX,y:a.pageY,id:b.id,"class":"show"}},a}())||j)),a("QueryViewer",k)}}}),System.register("views/query-viewer/result-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=this.isUnresolved(a)?"color:"+this.getColorValue(a):"";return b},a.prototype.isUnresolved=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"FINISHED";return!a||a.status!==b},a.prototype.getColorValue=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"ERROR",c=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"#FF0000",d=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"#00FF00";return a&&a.status!==b?d:c},a}()),a("ResultStyleValueConverter",d)}}}),System.register("views/query-viewer/result-value.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a?"FINISHED"!==a.status?a.status:a.count<0?"<=10":a.count:"not available"},a}()),a("ResultValueConverter",d)}}});
\ No newline at end of file
+"bundle";System.register("main.js",[],function(a,b){"use strict";function c(a){a.use.standardConfiguration().developmentLogging(),a.start().then(function(){return a.setRoot("shell")})}return a("configure",c),{setters:[],execute:function(){}}}),function(){var a=System.amdDefine;a("shell.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return"<template><router-view></router-view></template>"})}(),System.register("shell.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("Shell",d=function(){function a(){c(this,a)}return a.prototype.configureRouter=function(a,b){a.title="SHRINE Webclient Plugin",a.map([{route:"mailto",moduleId:"views/mailto/mailto"},{route:["","query-viewer"],moduleId:"views/query-viewer/query-viewer"}]),this.router=b},a}()),a("Shell",d)}}}),function(){var a=System.amdDefine;a("views/mailto/mailto.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="mailto"><div class="content"><p>If you have questions about your query results or this SHRINE network, contact the Data Steward at your site.</p><div class="email js-email"><button class="button button--large js-button" click.delegate="openEmail()">Email Data Steward</button></div></div></div></template>'})}(),System.register("views/mailto/mailto.service.js",["aurelia-framework","repository/qep.repository"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository}],execute:function(){a("MailToService",(f=d(e),h=f(g=function(){function a(b){c(this,a),this.repository=b}return a.prototype.fetchStewardEmail=function(){return this.repository.fetchStewardEmail()},a}())||g)),a("MailToService",h)}}}),System.register("views/mailto/mailto.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("MailConfig",c={mailto:"mailto:",subject:"subject="+encodeURIComponent("Question from a SHRINE User"),body:encodeURIComponent("Please enter the suggested information and your question. Your data steward will reply to this email.\n\n***Never send patient information, passwords, or other sensitive information by email****\nName:\nTitle:\nUser name (to log into SHRINE):\nTelephone Number (optional):\nPreferred email address (optional):\n\nQuestion or Comment:")}),a("MailConfig",c)}}}),System.register("views/mailto/mailto.js",["aurelia-framework","views/mailto/mailto.service","views/mailto/mailto.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.MailToService},function(a){f=a.MailConfig}],execute:function(){a("MailTo",(g=d(e,f),i=g(h=function(){function a(b,d){c(this,a),this.service=b,this.config=d}return a.prototype.openEmail=function(){var a=this;this.service.fetchStewardEmail().then(function(b){return window.top.location=a.getComposition(b),a})},a.prototype.getComposition=function(a){return this.config.mailto+a+"?"+this.config.subject+"&"+this.config.body},a}())||h)),a("MailTo",i)}}}),System.register("views/query-viewer/box-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("BoxStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return"transform: translate("+String(-100*a)+"%);"},a}()),a("BoxStyleValueConverter",d)}}}),function(){var a=System.amdDefine;a("views/query-viewer/context-menu/context-menu.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><ul class="context-menu ${context.class || \'hide\'}" mouseleave.trigger="context.class=\'hide\'" css="top: ${context.y - 40}; left: ${context.x - 50};"><li click.delegate="loadQuery(context.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li><li><a click.delegate="loadHistory(context.id)" href="#"><i class="fa fa-history"></i> Refresh All</a></li></ul></template>'})}(),System.register("views/query-viewer/context-menu/context-menu.js",["aurelia-framework","common/i2b2.service.js"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i,j,k,l,m;return{setters:[function(a){f=a.inject,g=a.bindable},function(a){h=a.I2B2Service}],execute:function(){a("ContextMenu",(i=f(h),m=i((k=function b(a){var e=this;d(this,b),c(this,"context",l,this),this.loadQuery=function(b){a.loadQuery(b),e.context["class"]="hide"},this.loadHistory=function(){e.context["class"]="hide",a.onHistory()}},l=e(k.prototype,"context",[g],{enumerable:!0,initializer:null}),j=k))||j)),a("ContextMenu",m)}}}),function(){var a=System.amdDefine;a("views/query-viewer/loading-bar/loading-bar.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><div class="loader"><h1>${status}</h1><div class="slider"><div class="line"></div><div class="break dot1"></div><div class="break dot2"></div><div class="break dot3"></div></div></div></template>'})}(),System.register("views/query-viewer/loading-bar/loading-bar.js",["aurelia-framework"],function(a,b){"use strict";function c(a,b,c,d){c&&Object.defineProperty(a,b,{enumerable:c.enumerable,configurable:c.configurable,writable:c.writable,value:c.initializer?c.initializer.call(d):void 0})}function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a,b,c,d,e){var f={};return Object.keys(d).forEach(function(a){f[a]=d[a]}),f.enumerable=!!f.enumerable,f.configurable=!!f.configurable,("value"in f||f.initializer)&&(f.writable=!0),f=c.slice().reverse().reduce(function(c,d){return d(a,b,c)||c},f),e&&void 0!==f.initializer&&(f.value=f.initializer?f.initializer.call(e):void 0,f.initializer=void 0),void 0===f.initializer&&(Object.defineProperty(a,b,f),f=null),f}var f,g,h,i;return{setters:[function(a){f=a.bindable}],execute:function(){a("LoadingBar",(g=function b(){d(this,b),c(this,"status",h,this)},h=e(g.prototype,"status",[f],{enumerable:!0,initializer:null}),i=g)),a("LoadingBar",i)}}}),function(){var a=System.amdDefine;a("views/query-viewer/query-viewer.html!github:systemjs/plugin-text@0.0.8.js",[],function(){return'<template><require from="views/query-viewer/result-style.converter"></require><require from="views/query-viewer/result-value.converter"></require><require from="views/query-viewer/box-style.converter"></require><require from="views/query-viewer/context-menu/context-menu"></require><require from="views/query-viewer/loading-bar/loading-bar"></require><loading-bar status.bind="\'Loading...\'" if.bind="showLoader"></loading-bar><div style="width: 100%; text-align: center"><ul class="circle-pagination" if.bind="showCircles"><li repeat.for="screen of screens" class="${screenIndex === $index? \'active\' : \'\'}" click.delegate="screenIndex = $index"><div>${screen.id}</div></li></ul></div><div class="box-wrapper"><div class="box" repeat.for="screen of screens" css.bind="screenIndex | boxStyle"><section><div><table cellpadding="0" cellspacing="0" border="0"><thead><tr><th class="tbl-header"></th><th repeat.for="node of screen.nodes" class="tbl-header"><div class="hideextra">${node}</div></th></tr></thead></table></div><context-menu context.bind="context"></context-menu><div class="tbl-content ${vertStyle}"><table cellpadding="0" cellspacing="0" border="0"><tbody><tr repeat.for="result of screen.results" contextmenu.trigger="context = getContext($event, result)"><th><div class="hideextra">${result.name}</div></th><td repeat.for="nodeResult of result.nodeResults" css="${nodeResult | resultStyle}">${nodeResult | result}</td></tr></tbody></table></div></section></div></div></template>'})}(),System.register("repository/qep.repository.js",["aurelia-framework","aurelia-fetch-client","fetch"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.HttpClient},function(a){}],execute:function(){f=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),a("QEPRepository",(g=d(e),i=g(h=function(){function a(b){var d=this;c(this,a),b.configure(function(a){a.useStandardConfiguration().withBaseUrl(d.url).withDefaults({headers:{Authorization:"Basic "+d.auth}})}),this.http=b}return a.prototype.fetchPreviousQueries=function(){return this.http.fetch("qep/queryResults").then(function(a){return a.json()})["catch"](function(a){return a})},a.prototype.fetchStewardEmail=function(){return this.http.fetch("data?key=stewardEmail").then(function(a){return a.json()}).then(function(a){return a.indexOf('"')>0?a.split('"')[1]:a})["catch"](function(){return""})},f(a,[{key:"url",get:function(){var a=document.URL,b=":6443/shrine-metadata/";return a.substring(0,a.lastIndexOf(":"))+b}},{key:"auth",get:function(){var a=sessionStorage.getItem("shrine.auth");return sessionStorage.removeItem("shrine.auth"),a}}]),a}())||h)),a("QEPRepository",i)}}}),System.register("views/query-viewer/query-viewer.config.js",[],function(a,b){"use strict";var c;return{setters:[],execute:function(){a("QueryViewerConfig",c={maxNodesPerScreen:10}),a("QueryViewerConfig",c)}}}),System.register("views/query-viewer/query-viewer.service.js",["aurelia-framework","repository/qep.repository","./query-viewer.config"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i;return{setters:[function(a){d=a.inject},function(a){e=a.QEPRepository},function(a){f=a.QueryViewerConfig}],execute:function(){a("QueryViewerService",(g=d(e,f),i=g(h=function(){function a(b,d,e){c(this,a),this.repository=b,this.config=d}return a.prototype.fetchPreviousQueries=function(){return this.repository.fetchPreviousQueries()},a.prototype.getScreens=function(a,b){var c=this;return new Promise(function(d,e){for(var f=a.sort().length,g=[],h=0;h<f;h+=c.config.maxNodesPerScreen){var i=c.getNumberOfNodesOnScreen(a,h,c.config.maxNodesPerScreen),j=i-1,k=c.getScreenId(a,h,j),l=a.slice(h,i),m=c.mapQueriesToScreenNodes(l,b,c.findQueriesForNode);g.push({id:k,nodes:l,results:m})}d(g)})},a.prototype.mapQueriesToScreenNodes=function(a,b){var c=[];return b.forEach(function(b,d){var e={name:b.query.queryName,id:b.query.networkId,nodeResults:[]};a.forEach(function(a){e.nodeResults.push(b.adaptersToResults.find(function(b){return b.adapterNode===a}))}),c.push(e)}),c},a.prototype.getNumberOfNodesOnScreen=function(a,b){var c=b+this.config.maxNodesPerScreen;return c<a.length?c:a.length},a.prototype.getScreenId=function(a,b,c){var d=a[b],e=a[c];return String(d).substr(0,1)+"-"+String(e).substr(0,1)},a}())||h)),a("QueryViewerService",i)}}}),System.register("common/i2b2.service.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g;return{setters:[],execute:function(){a("I2B2Service",d=function b(){var a=arguments.length>0&&void 0!==arguments[0]?arguments[0]:window;c(this,b);var d=e(a,"i2b2");this.onResize=function(a){return d?d.events.changedZoomWindows.subscribe(a):null},this.onHistory=d?d.CRC.view.history.doRefreshAll:null,this.loadQuery=function(a){return d?d.CRC.ctrlr.QT.doQueryLoad(a):null}}),a("I2B2Service",d),e=function(a,b){return g(a)?f(a)[b]:null},f=function(a){return a.parent.window},g=function(a){return a&&a.parent&&a.parent.window}}}}),System.register("views/query-viewer/query-viewer.model.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("QueryViewerModel",d=function b(){c(this,b),this.isLoaded=!1,this.screens=[]}),a("QueryViewerModel",d)}}}),System.register("views/query-viewer/query-viewer.js",["aurelia-framework","views/query-viewer/query-viewer.service","common/i2b2.service.js","./query-viewer.model"],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d,e,f,g,h,i,j,k;return{setters:[function(a){d=a.inject,e=a.computedFrom},function(a){f=a.QueryViewerService},function(a){g=a.I2B2Service},function(a){h=a.QueryViewerModel}],execute:function(){a("QueryViewer",(i=d(f,g,h),k=i(j=function(){function a(b,d,e){var f=this;c(this,a),this.screenIndex=0,this.showCircles=!1,this.showLoader=!0,this.service=b,this.vertStyle="v-min";var g=function(a){return f.service.getScreens(a.adapters,a.queryResults)},h=function(a){f.showLoader=!1,f.screens=a,f.showCircles=f.screens.length>1,e.screens=a,e.isLoaded=!0},i=function(){return f.service.fetchPreviousQueries().then(g).then(h)["catch"](function(a){return console.log(a)})},j=function(){return e.isLoaded?h(e.screens):i()},k=function(a){return"ADD"!==a.action},l=function(a,b){return f.vertStyle=b.find(k)?"v-min":"v-full"};d.onResize(l),d.onHistory(i),j()}return a.prototype.getContext=function(a,b){return{x:a.pageX,y:a.pageY,id:b.id,"class":"show"}},a}())||j)),a("QueryViewer",k)}}}),System.register("views/query-viewer/result-style.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultStyleValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){var b=this.isUnresolved(a)?"color:"+this.getColorValue(a):"";return b},a.prototype.isUnresolved=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"FINISHED";return!a||a.status!==b},a.prototype.getColorValue=function(a){var b=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"ERROR",c=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"#FF0000",d=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"#00FF00";return a&&a.status!==b?d:c},a}()),a("ResultStyleValueConverter",d)}}}),System.register("views/query-viewer/result-value.converter.js",[],function(a,b){"use strict";function c(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var d;return{setters:[],execute:function(){a("ResultValueConverter",d=function(){function a(){c(this,a)}return a.prototype.toView=function(a){return a?"FINISHED"!==a.status?a.status:a.count<0?"<=10":a.count:"not available"},a}()),a("ResultValueConverter",d)}}});
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/src/common/i2b2.service.js b/shrine-webclient/src/main/js/client/js-shrine/src/common/i2b2.service.js
index 857f8dca1..929bb3d4a 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/src/common/i2b2.service.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/src/common/i2b2.service.js
@@ -1,13 +1,13 @@
 export class I2B2Service {
     constructor(context = window) {
         const i2b2 = getLib(context, 'i2b2');
         this.onResize = f => (i2b2) ? i2b2.events.changedZoomWindows.subscribe(f) : null;
-        this.onHistory = f => (i2b2)? i2b2.CRC.ctrlr.history.events.onDataUpdate.subscribe(f) : null;
+        this.onHistory = (i2b2)? i2b2.CRC.view.history.doRefreshAll  : null;
         this.loadQuery = id => (i2b2)? i2b2.CRC.ctrlr.QT.doQueryLoad(id) :  null;
     }
 }
 
 //@todo compose these functions?
 const getLib = (context, lib) => hasParent(context) ? getParent(context)[lib] : null;
 const getParent = (context) => context.parent.window;
 const hasParent = (context) => context && context.parent && context.parent.window;
diff --git a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.html b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.html
index 317d5b084..01b3b3da4 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.html
+++ b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.html
@@ -1,9 +1,6 @@
 <template>
     <ul class="context-menu ${context.class || 'hide'}" mouseleave.trigger="context.class='hide'" css="top: ${context.y - 40}; left: ${context.x - 50};">
         <li click.delegate="loadQuery(context.id)"><a href="#"><i class="fa fa-files-o"></i> Clone</a></li>
-        <!--li><a href="#"><i class="fa fa-pencil"></i> Rename</a></li-->
-        <li><a href="#"><i class="fa fa-history"></i> Refresh All</a></li>
-        <!--li><a href="#"><i class="fa fa-bookmark"></i> Flag</a></li-->
-        <!--li><a href="#"><i class="fa fa-bookmark-o"></i> Unflag</a></li-->
+        <li><a click.delegate="loadHistory(context.id)" href="#"><i class="fa fa-history"></i> Refresh All</a></li>
     </ul>
 </template>
\ No newline at end of file
diff --git a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.js b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.js
index 8bc7d4ea0..d1caa46cd 100644
--- a/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.js
+++ b/shrine-webclient/src/main/js/client/js-shrine/src/views/query-viewer/context-menu/context-menu.js
@@ -1,14 +1,19 @@
 import {inject, bindable} from 'aurelia-framework';
 import { I2B2Service } from 'common/i2b2.service.js';
 
 @inject(I2B2Service)
 export class ContextMenu {
     @bindable context;
 
     constructor(i2b2Svc) {
         this.loadQuery = id => {
             i2b2Svc.loadQuery(id);
             this.context.class = 'hide';
         }
+
+      this.loadHistory = () => {
+        this.context.class = 'hide';
+        i2b2Svc.onHistory();
+      };
     }
 }
\ No newline at end of file