diff --git a/core/cleanup.py b/core/cleanup.py
index 0a2a3f5..800b582 100644
--- a/core/cleanup.py
+++ b/core/cleanup.py
@@ -43,7 +43,7 @@ class CleanupTimer:
         try:
             for i in list(DATA_STORE.spots.keys()):
                 try:
-                    spot = DATA_STORE.spots[i]
+                    spot = DATA_STORE.spots.get(i)
                     if spot.expired():
                         DATA_STORE.spots.delete(i)
                 except KeyError:
@@ -51,7 +51,7 @@ class CleanupTimer:
                     pass
             for i in list(DATA_STORE.alerts.keys()):
                 try:
-                    alert = DATA_STORE.alerts[i]
+                    alert = DATA_STORE.alerts.get(i)
                     if alert.expired():
                         DATA_STORE.alerts.delete(i)
                 except KeyError:
diff --git a/core/data_store.py b/core/data_store.py
index f58720c..97ae973 100644
--- a/core/data_store.py
+++ b/core/data_store.py
@@ -103,6 +103,9 @@ class DataStore:
             self.dxcc_lookup_by_call_regex.append((re.compile(entry["prefixRegex"]), entry["entityCode"]))
 
     def close(self):
+        self.spots.save_snapshot()
+        self.alerts.save_snapshot()
+
         self.spots.close()
         self.alerts.close()
         self._solar.close()
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 2e0683b..8163620 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1786601367"></script>
+<script src="/static/js/add-spot.js?v=1786601585"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 8cb85d2..3c00668 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -82,7 +82,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1786601367"></script>
+<script src="/static/js/alerts.js?v=1786601585"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index 1241abf..8286586 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -79,8 +79,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786601367"></script>
-<script src="/static/js/bands.js?v=1786601367"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786601585"></script>
+<script src="/static/js/bands.js?v=1786601585"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 6a02ef6..5d18d8a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1786601367" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1786601585" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -10,10 +10,10 @@
 <script src="/static/vendor/js/bootstrap-5.3.8.bundle.min.js"></script>
 <script src="/static/vendor/js/tinycolor2-1.6.0.min.js"></script>
 
-<script src="/static/js/utils.js?v=1786601367"></script>
-<script src="/static/js/ui-ham.js?v=1786601367"></script>
-<script src="/static/js/geo.js?v=1786601367"></script>
-<script src="/static/js/common.js?v=1786601367"></script>
+<script src="/static/js/utils.js?v=1786601585"></script>
+<script src="/static/js/ui-ham.js?v=1786601585"></script>
+<script src="/static/js/geo.js?v=1786601585"></script>
+<script src="/static/js/common.js?v=1786601585"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 7aaa679..ef230cd 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1786601367"></script>
+<script src="/static/js/conditions.js?v=1786601585"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index 2a83fc5..4466c2b 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -112,8 +112,8 @@
 <script src="/static/vendor/js/leaflet-cqzones.js"></script>
 <script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786601367"></script>
-<script src="/static/js/map.js?v=1786601367"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786601585"></script>
+<script src="/static/js/map.js?v=1786601585"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index 35886a4..82a72d0 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -118,8 +118,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786601367"></script>
-<script src="/static/js/spots.js?v=1786601367"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786601585"></script>
+<script src="/static/js/spots.js?v=1786601585"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 1b07921..1b9adca 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -86,7 +86,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1786601367"></script>
+<script src="/static/js/status.js?v=1786601585"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");