diff --git a/server/webserver.py b/server/webserver.py
index 5a0219f..325d730 100644
--- a/server/webserver.py
+++ b/server/webserver.py
@@ -139,7 +139,9 @@ class WebServer:
         spot_ids = list(self.spots.iterkeys())
         spots = []
         for k in spot_ids:
-            spots.append(self.spots.get(k))
+            s = self.spots.get(k)
+            if s is not None:
+                spots.append(s)
         spots = sorted(spots, key=lambda spot: (spot.time if spot and spot.time else 0), reverse=True)
         for k in query.keys():
             match k:
diff --git a/webassets/js/spots.js b/webassets/js/spots.js
index be8607e..821ae7f 100644
--- a/webassets/js/spots.js
+++ b/webassets/js/spots.js
@@ -225,13 +225,13 @@ function updateTable() {
         }
         $td2 = $("<td colspan='100'>");
         if (showSource) {
-            $td2.append(`<span class='icon-wrapper'><i class='fa-solid fa-${s["icon"]}'></i></span> `);
+            $td2.append(`<span class='icon-wrapper'><i class='fa-solid fa-${s["icon"]}'></i></span> ${sigSourceText} `);
         }
         if (showRef) {
             $td2.append(`${sig_refs} `);
         }
         if (showBearing) {
-            $td2.append(`${bearingText} `);
+            $td2.append(` &nbsp; Bearing: ${bearingText} `);
         }
         if (showComment) {
             $td2.append(`<br/>${commentText}`);