diff --git a/src/main/xar-resources/index.html b/src/main/xar-resources/index.html
index f0816e1..e9d7133 100644
--- a/src/main/xar-resources/index.html
+++ b/src/main/xar-resources/index.html
@@ -49,7 +49,7 @@ <h1>
                         <span class="info-box-text">
                             Uptime
                         </span>
-                        <span class="info-box-number" id="jmx-uptime" data-bind="text: uptime($data.jmx.Database.Uptime())">?</span>
+                        <span class="info-box-number" id="jmx-uptime" data-bind="text: uptime($data?.jmx?.Database?.Uptime() ?? '')">?</span>
                     </div>
                 </div>
             </div><!-- ./col -->
@@ -63,7 +63,7 @@ <h1>
                             Running Queries
                         </span>
                         <span class="info-box-number">
-                            <span id="jmx-queries" data-bind="text: $data.jmx.ProcessReport.RunningQueries().length || 0">?</span>
+                          <span id="jmx-queries" data-bind="text: $data?.jmx?.ProcessReport?.RunningQueries?.()?.length ?? '???'">?</span>
                         </span>
                     </div>
                 </div>
@@ -104,31 +104,31 @@ <h3 class="box-title">Java Memory</h3>
                                     <div class="clearfix">
                                         <span class="pull-left">Memory Used</span>
                                         <small class="pull-right">
-                                            <span data-bind="text: Math.floor(parseInt($data.used()) / 1024 / 1024)">10</span> /
-                                            <span data-bind="text: Math.floor(parseInt($data.max()) / 1024 / 1024)">10</span> M
+                                            <span data-bind="text: Math.floor(parseInt($data?.used?.() ?? 0) / 1024 / 1024)">10</span> /
+                                            <span data-bind="text: Math.floor(parseInt($data?.max?.() ?? 0) / 1024 / 1024)">10</span> M
                                         </small>
                                     </div>
                                     <div class="progress xs">
-                                        <div class="progress-bar progress-bar-green" data-bind="style: {width: Math.round($data.used() / ($data.max() / 100)) + '%'}"/>
+                                      <div class="progress-bar progress-bar-green" data-bind="style: {width: Math.round(($data?.used?.() ?? 0) / (($data?.max?.() ?? 1) / 100)) + '%'}"/>
                                     </div>
                                 </div><!-- /.pad -->
                                 <div class="pad"><!-- Progress bars -->
                                     <div class="clearfix">
                                         <span class="pull-left">Memory Committed</span>
                                         <small class="pull-right">
-                                            <span data-bind="text: Math.floor(parseInt($data.committed()) / 1024 / 1024)">10</span> /
-                                            <span data-bind="text: Math.floor(parseInt($data.max()) / 1024 / 1024)">10</span> M
+                                            <span data-bind="text: Math.floor(parseInt($data?.committed?.() ?? 0) / 1024 / 1024)">10</span> /
+                                          <span data-bind="text: Math.floor(parseInt($data?.max?.() ?? 0) / 1024 / 1024)">10</span> M
                                         </small>
                                     </div>
                                     <div class="progress xs">
-                                        <div class="progress-bar progress-bar-green" data-bind="style: {width: Math.round($data.committed() / ($data.max() / 100)) + '%'}"/>
+                                      <div class="progress-bar progress-bar-green" data-bind="style: {width: Math.round(($data?.committed?.() ?? 0) / (($data?.max?.() ?? 1) / 100)) + '%'}"/>
                                     </div>
                                 </div><!-- /.pad -->
                             </div><!-- /.col -->
                         </div><!-- /.row - inside box -->
                     </div><!-- /.box-body -->
                     <div class="box-footer">
-                        <button class="btn btn-warning" data-bind="visible: parseInt($data.jmx.version()) &gt; 0, click: gc">Garbage Collect</button>
+                        <button class="btn btn-warning" data-bind="visible: parseInt($data?.jmx?.version?.() ?? 0) &gt; 0, click: gc">Garbage Collect</button>
                     </div>
                 </div><!-- /.box -->
             </section>
@@ -182,16 +182,16 @@ <h3 class="box-title">Running Jobs</h3>
                                     <th>Info</th>
                                 </tr>
                             </thead>
-                            <tbody data-bind="visible: $data.jmx.ProcessReport.RunningJobs().length == 0">
+                            <tbody data-bind="visible: ( $data?.jmx?.ProcessReport?.RunningJobs?.()?.length ?? 0 ) == 0">
                                 <tr>
-                                    <td colspan="5">No running jobs</td>
+                                    <td colspan="3">No running jobs</td>
                                 </tr>
                             </tbody>
-                            <tbody data-bind="foreach: jmx.ProcessReport.RunningJobs">
+                          <tbody data-bind="foreach: { data: jmx.ProcessReport.RunningJobs }">
                                 <tr>
-                                    <td data-bind="text: action"/>
-                                    <td data-bind="text: id"/>
-                                    <td data-bind="text: info"/>
+                                  <td data-bind="text: ( $data?.action?.() ?? $data?.value?.action?.() ?? '' )"/>
+                                  <td data-bind="text: ( $data?.id?.() ?? $data?.value?.id?.() ?? '' )"/>
+                                  <td data-bind="text: ( $data?.info?.() ?? $data?.value?.info?.() ?? '' )"/>
                                 </tr>
                             </tbody>
                         </table>
@@ -250,19 +250,19 @@ <h3 class="box-title">System Information</h3>
                                 </tr>
                                 <tr data-bind="if: $data.jmx.OperatingSystemImpl">
                                     <td>System CPU Load:</td>
-                                    <td data-bind="text: parseFloat($data.jmx.OperatingSystemImpl.SystemCpuLoad()).toPrecision(6)"/>
+                                    <td data-bind="text: parseFloat($data?.jmx?.OperatingSystemImpl?.SystemCpuLoad?.() ?? 0).toPrecision(6)"/>
                                 </tr>
                                 <tr data-bind="if: $data.jmx.OperatingSystemImpl">
                                     <td>Process CPU Load:</td>
-                                    <td data-bind="text: parseFloat($data.jmx.OperatingSystemImpl.ProcessCpuLoad()).toPrecision(6)"/>
+                                    <td data-bind="text: parseFloat($data?.jmx?.OperatingSystemImpl?.ProcessCpuLoad?.() ?? 0).toPrecision(6)"/>
                                 </tr>
                                 <tr data-bind="if: $data.jmx.OperatingSystemImpl">
                                     <td>Free Physical Memory:</td>
-                                    <td data-bind="text: parseInt($data.jmx.OperatingSystemImpl.FreePhysicalMemorySize())"/>
+                                    <td data-bind="text: parseInt($data?.jmx?.OperatingSystemImpl?.FreePhysicalMemorySize?.() ?? 0)"/>
                                 </tr>
                                 <tr data-bind="if: $data.jmx.OperatingSystemImpl">
                                     <td>Total Physical Memory:</td>
-                                    <td data-bind="text: parseInt($data.jmx.OperatingSystemImpl.TotalPhysicalMemorySize())"/>
+                                    <td data-bind="text: parseInt($data?.jmx?.OperatingSystemImpl?.TotalPhysicalMemorySize?.() ?? 0)"/>
                                 </tr>
                             </tbody>
                         </table>
@@ -301,7 +301,7 @@ <h3 class="box-title">Cache Usage</h3>
                                 Using <span data-bind="text: CurrentSize">0</span> of <span data-bind="text: MaxTotal">0</span> pages</small>
                         </div>
                         <div class="progress xs">
-                            <div class="progress-bar progress-bar-success progress-cache" data-bind="style: {width: Math.round($data.CurrentSize() / ($data.MaxTotal() / 100)) + '%'}"/>
+                            <div class="progress-bar progress-bar-success progress-cache" data-bind="style: {width: Math.round(($data?.CurrentSize?.() ?? 0) / (($data?.MaxTotal?.() ?? 1) / 100)) + '%'}"/>
                         </div>
                     </div>
                     <div class="box-body jmx-cache-manager" data-bind="with: findByName($data.jmx.CacheManager, 'org.exist.management.exist:type=CollectionCacheManager')">
@@ -311,10 +311,10 @@ <h3 class="box-title">Cache Usage</h3>
                                 Using <span data-bind="text: CurrentSize">0</span> of <span data-bind="text: MaxTotal">0</span> bytes</small>
                         </div>
                         <div class="progress xs">
-                            <div class="progress-bar progress-bar-success progress-cache" data-bind="style: {width: Math.round($data.CurrentSize() / ($data.MaxTotal() / 100)) + '%'}"/>
+                            <div class="progress-bar progress-bar-success progress-cache" data-bind="style: {width: Math.round(($data?.CurrentSize?.() ?? 0) / (($data?.MaxTotal?.() ?? 0) / 100)) + '%'}"/>
                         </div>
                     </div>
-                    <div class="box-body jmx-cache" data-bind="with: findByName($data.jmx.Cache(), 'org.exist.management.exist:type=CacheManager.Cache,name=dom.dbx,cache-type=BTREE')">
+                    <div class="box-body jmx-cache" data-bind="with: findByName($data?.jmx?.Cache?.(), 'org.exist.management.exist:type=CacheManager.Cache,name=dom.dbx,cache-type=BTREE')">
                         <div class="clearfix">
                             <span class="pull-left">dom.dbx (BTree)</span>
                             <small class="pull-right">
@@ -327,10 +327,10 @@ <h3 class="box-title">Cache Usage</h3>
                             </small>
                         </div>
                         <div class="progress xs">
-                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round($data.Used() / ($data.Size() / 100)) + '%'}"/>
+                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round(($data?.Used?.() ?? 0) / (($data?.Size?.() ?? 1) / 100)) + '%'}"/>
                         </div>
                     </div>
-                    <div class="box-body jmx-cache" data-bind="with: findByName($data.jmx.Cache(), 'org.exist.management.exist:type=CacheManager.Cache,name=structure.dbx,cache-type=BTREE')">
+                    <div class="box-body jmx-cache" data-bind="with: findByName($data?.jmx?.Cache?.(), 'org.exist.management.exist:type=CacheManager.Cache,name=structure.dbx,cache-type=BTREE')">
                         <div class="clearfix">
                             <span class="pull-left">structure.dbx (BTree)</span>
                             <small class="pull-right">
@@ -343,10 +343,10 @@ <h3 class="box-title">Cache Usage</h3>
                             </small>
                         </div>
                         <div class="progress xs">
-                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round($data.Used() / ($data.Size() / 100)) + '%'}"/>
+                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round(($data?.Used?.() ?? 0) / (($data?.Size?.() ?? 1) / 100)) + '%'}"/>
                         </div>
                     </div>
-                    <div class="box-body jmx-cache" data-bind="with: findByName($data.jmx.Cache(), 'org.exist.management.exist:type=CacheManager.Cache,name=collections.dbx,cache-type=BTREE')">
+                    <div class="box-body jmx-cache" data-bind="with: findByName($data?.jmx?.Cache?.(), 'org.exist.management.exist:type=CacheManager.Cache,name=collections.dbx,cache-type=BTREE')">
                         <div class="clearfix">
                             <span class="pull-left">collections.dbx (BTree)</span>
                             <small class="pull-right">
@@ -359,10 +359,10 @@ <h3 class="box-title">Cache Usage</h3>
                             </small>
                         </div>
                         <div class="progress xs">
-                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round($data.Used() / ($data.Size() / 100)) + '%'}"/>
+                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round(($data?.Used?.() ?? 0) / (($data?.Size?.() ?? 1) / 100)) + '%'}"/>
                         </div>
                     </div>
-                    <div class="box-body jmx-cache" data-bind="with: findByName($data.jmx.Cache(), 'org.exist.management.exist:type=CacheManager.Cache,name=values.dbx,cache-type=BTREE')">
+                    <div class="box-body jmx-cache" data-bind="with: findByName($data?.jmx?.Cache?.(), 'org.exist.management.exist:type=CacheManager.Cache,name=values.dbx,cache-type=BTREE')">
                         <div class="clearfix">
                             <span class="pull-left">values.dbx (BTree)</span>
                             <small class="pull-right">
@@ -375,7 +375,7 @@ <h3 class="box-title">Cache Usage</h3>
                             </small>
                         </div>
                         <div class="progress xs">
-                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round($data.Used() / ($data.Size() / 100)) + '%'}"/>
+                            <div class="progress-bar progress-bar-info progress-cache" data-bind="style: {width: Math.round(($data?.Used?.() ?? 0) / (($data?.Size?.() ?? 1) / 100)) + '%'}"/>
                         </div>
                     </div>
                 </div>
@@ -405,22 +405,22 @@ <h3 class="box-title">Running Queries</h3>
                                         <th/>
                                     </tr>
                                 </thead>
-                                <tbody data-bind="visible: $data.jmx.ProcessReport.RunningQueries().length == 0">
+                                <tbody data-bind="visible: ( $data?.jmx?.ProcessReport?.RunningQueries?.()?.length ?? 0 ) == 0">
                                     <tr>
                                         <td colspan="5">No running queries</td>
                                     </tr>
                                 </tbody>
                                 <tbody data-bind="foreach: { data: jmx.ProcessReport.RunningQueries, afterRender: addKillBtn }">
                                     <tr>
-                                        <td data-bind="text: $data.thread ? $data.thread : $data.id"/>
+                                        <td data-bind="text: ( $data.thread ?? $data.value.thread ?? $data.id ?? $data.value.id )" />
                                         <td>
-                                            <span class="source-key" data-bind="text: $data.sourceKey().replace(/^.*\/([^\/]+)$/, '$1'), attr: { title: sourceKey }" data-toggle="tooltip"/>
+                                          <span class="source-key" data-bind="text: ( $data?.sourceKey?.() ?? $data?.value?.sourceKey?.() )?.replace(/^.*\/([^\/]+)$/, '$1') ?? '???', attr: { title: ( $data?.sourceKey?.() ?? $data?.value?.sourceKey?.() ?? '' ) }" data-toggle="tooltip"/>
                                         </td>
                                         <td>
-                                            <a target="_new" data-bind="attr: { href: (typeof $data.requestURI == 'function' ? ($root.url + $data.requestURI()) : '#') }, text: ($data.requestURI ? $data.requestURI : '')"/>
+                                          <a target="_blank" data-bind="attr: { href: $root.url +( $data?.requestURI?.() ?? $data?.value?.requestURI?.() ?? '#') }, text: ($data?.requestURI ?? $data?.value?.requestURI ?? '???')"/>
                                         </td>
                                         <td>
-                                            <span class="label" data-bind="text: $data.terminating() == 'false' ? 'running' : 'terminating', css: { 'label-success': $data.terminating() == 'false', 'label-warning': $data.terminating() == 'true' }"/>
+                                          <span class="label" data-bind="text: ( $data?.terminating?.() ?? $data?.value?.terminating?.() ?? 'false' ) == 'false' ? 'running' : 'terminating', css: { 'label-success': ( $data?.terminating?.() ?? $data?.value?.terminating?.() ?? 'false' ) == 'false', 'label-warning': ( $data?.terminating?.() ?? $data?.value?.terminating?.() ?? 'false' ) == 'true' }"/>
                                         </td>
                                         <td>
                                             <a href="#" class="kill-query" title="Kill Query" data-bind="if: JMX_INSTANCE.name == 'localhost' || JMX_INSTANCE.version != 0">
@@ -460,20 +460,20 @@ <h3 class="box-title">Recent Queries
                                         <th>Request URI</th>
                                     </tr>
                                 </thead>
-                                <tbody data-bind="visible: $data.jmx.ProcessReport.RecentQueryHistory().length == 0">
+                                <tbody data-bind="visible: ( $data?.jmx?.ProcessReport?.RecentQueryHistory?.()?.length ?? 0) == 0">
                                     <tr>
-                                        <td colspan="2">Empty</td>
+                                        <td colspan="4">No recent queries</td>
                                     </tr>
                                 </tbody>
-                                <tbody id="jmx-recent-queries" data-bind="visible: $data.jmx.ProcessReport.RecentQueryHistory().length &gt; 0, foreach: {data: jmx.ProcessReport.RecentQueryHistory, afterRender: function(node) { $('.source-key', node).tooltip(); }}">
+                                <tbody id="jmx-recent-queries" data-bind="visible: ( $data?.jmx?.ProcessReport?.RecentQueryHistory?.()?.length ?? 0 ) &gt; 0, foreach: {data: $data.jmx.ProcessReport.RecentQueryHistory, afterRender: function(node) { $('.source-key', node).tooltip(); }}">
                                     <tr>
-                                        <td data-bind="text: new Date(parseInt($data.mostRecentExecutionTime())).toISOString()"/>
+                                      <td data-bind="text: new Date(parseInt( $data?.mostRecentExecutionTime?.() ?? $data?.value?.mostRecentExecutionTime?.() ?? 0 )).toISOString()"/>
                                         <td>
-                                            <span class="source-key" data-bind="text: $data.sourceKey().replace(/^.*\/([^\/]+)$/, '$1'), attr: { title: sourceKey }" data-toggle="tooltip"/>
+                                          <span class="source-key"  data-bind="text: ( $data?.sourceKey?.() ?? $data?.value?.sourceKey?.() )?.replace(/^.*\/([^\/]+)$/, '$1') ?? '???', attr: { title: ( $data?.sourceKey?.() ?? $data?.value?.sourceKey?.() ?? '' ) }" data-toggle="tooltip"/>
                                         </td>
-                                        <td data-bind="text: mostRecentExecutionDuration"/>
+                                        <td data-bind="text: ( $data?.mostRecentExecutionDuration?.() ?? $data?.value?.mostRecentExecutionDuration?.() ?? '' )"/>
                                         <td>
-                                            <a target="_new" data-bind="attr: { href: (typeof $data.requestURI == 'function' ? ($root.url + $data.requestURI()) : '#') }, text: ($data.requestURI ? $data.requestURI : '')"/>
+                                          <a target="_blank" data-bind="attr: { href: $root.url + ( $data?.requestURI?.() ?? $data?.value?.requestURI() ?? '#' ) }, text: ( $data?.requestURI?.() ?? $data?.value?.requestURI() ?? '#' )"/>
                                         </td>
                                     </tr>
                                 </tbody>
@@ -487,7 +487,7 @@ <h3 class="box-title">Recent Queries
                                 <input type="text" class="form-control" id="threshold" title="The minimum execution time for a query to be recorded"/>
                             </div>
                             <div class="form-group">
-                                <label for="history-max">Keep history for (ms): </label>
+                              <label for="history-timespan">Keep history for (ms): </label>
                                 <input type="text" class="form-control" id="history-timespan" title="The time in seconds to keep queries in the history"/>
                             </div>
                             <div class="form-group">
@@ -523,9 +523,9 @@ <h3 class="box-title">Waiting Threads</h3>
                                     <th>Waiting for</th>
                                 </tr>
                             </thead>
-                            <tbody data-bind="visible: !$data.jmx.LockTable.Acquired() || $data.jmx.LockTable.Acquired().length == 0">
+                            <tbody data-bind="visible: !$data?.jmx?.LockTable?.Acquired?.() || $data?.jmx?.LockTable?.Acquired?.()?.length == 0">
                                 <tr>
-                                    <td colspan="5">No waiting threads</td>
+                                    <td colspan="2">No waiting threads</td>
                                 </tr>
                             </tbody>
                             <tbody data-bind="foreach: jmx.LockTable.Acquired">
@@ -562,7 +562,7 @@ <h3 class="box-title">Active Threads</h3>
                                     <th/>
                                 </tr>
                             </thead>
-                            <tbody data-bind="visible: $data.jmx.Database.ActiveBrokersMap().length == 0">
+                            <tbody data-bind="visible: $data?.jmx?.Database?.ActiveBrokersMap?.()?.length == 0">
                                 <tr>
                                     <td colspan="2">No active threads</td>
                                 </tr>
@@ -583,12 +583,12 @@ <h3 class="box-title">Active Threads</h3>
             </section>
         </div>
     </section>
-    <script type="text/javascript" src="resources/scripts/modernizr.custom.js"></script>
-    <script type="text/javascript" src="resources/scripts/knockout-latest.js"></script>
-    <script type="text/javascript" src="resources/scripts/knockout.mapping.js"></script>
-    <script type="text/javascript" src="resources/scripts/jquery.flot.min.js"></script>
-    <script type="text/javascript" src="resources/scripts/jquery.flot.time.min.js"></script>
-    <script type="text/javascript" src="resources/scripts/ion.rangeSlider.min.js"></script>
-    <script type="text/javascript" src="resources/scripts/util.js"></script>
-    <script type="text/javascript" src="resources/scripts/exadmin.js"></script>
-</div>
+    <script type="text/javascript" src="resources/scripts/modernizr.custom.js"> </script>
+    <script type="text/javascript" src="resources/scripts/knockout-latest.js"> </script>
+    <script type="text/javascript" src="resources/scripts/knockout.mapping.js"> </script>
+    <script type="text/javascript" src="resources/scripts/jquery.flot.min.js"> </script>
+    <script type="text/javascript" src="resources/scripts/jquery.flot.time.min.js"> </script>
+    <script type="text/javascript" src="resources/scripts/ion.rangeSlider.min.js"> </script>
+    <script type="text/javascript" src="resources/scripts/util.js"> </script>
+    <script type="text/javascript" src="resources/scripts/exadmin.js"> </script>
+</div>
\ No newline at end of file