diff --git a/package.nw/lib/roster.js b/package.nw/lib/roster.js
index e47d1776..fce71674 100644
--- a/package.nw/lib/roster.js
+++ b/package.nw/lib/roster.js
@@ -421,6 +421,7 @@ function realtimeRoster()
       lifeCols[x].innerHTML = toDHMS(when);
     }
   }
+
   if (CR.rosterSettings.columns.Spot)
   {
     let spotCols = document.getElementsByClassName("spotCol");
@@ -428,14 +429,7 @@ function realtimeRoster()
     {
       if ((typeof spotCols[x].id != "undefined") && (typeof CR.callRoster[spotCols[x].id.substr(2)] != "undefined"))
       {
-        spotCols[x].innerHTML = getSpotString(
-          CR.callRoster[spotCols[x].id.substr(2)].callObj
-        );
-        if (CR.rosterSettings.onlySpot && spotCols[x].innerHTML == "")
-        {
-          viewRoster();
-          return;
-        }
+        spotCols[x].innerHTML = getSpotString(CR.callRoster[spotCols[x].id.substr(2)].callObj);
       }
     }
   }
@@ -1099,8 +1093,6 @@ function wantedChanged(element)
 
 function valuesChanged()
 {
-  setVisual();
-
   CR.rosterSettings.callsign = callsignNeed.value;
   CR.rosterSettings.hunting = huntMode.value;
   CR.rosterSettings.huntNeed = huntNeed.value;
@@ -1155,7 +1147,8 @@ function valuesChanged()
   {
     window.opener.GT.callRoster[callHash].callObj.alerted = false;
   }
-  viewRoster();
+  
+  setVisual();
 }
 
 function loadFilterSettings()
diff --git a/package.nw/lib/roster/processRosterFiltering.js b/package.nw/lib/roster/processRosterFiltering.js
index d2c6dd1b..8f222cdd 100644
--- a/package.nw/lib/roster/processRosterFiltering.js
+++ b/package.nw/lib/roster/processRosterFiltering.js
@@ -182,6 +182,12 @@ function processRosterFiltering(callRoster, rosterSettings)
       continue;
     }
 
+    if (CR.rosterSettings.columns.Spot == true && CR.rosterSettings.onlySpot == true && (callObj.spot.when == 0 || (timeNowSec() - callObj.spot.when > window.opener.GT.receptionSettings.viewHistoryTimeSec)))
+    {
+      entry.tx = false;
+      continue;
+    }
+
     let usesOneOf = 0;
     let checkUses = 0;