diff --git a/package.nw/gt_roster.html b/package.nw/gt_roster.html
index 48d6b7b..6488696 100644
--- a/package.nw/gt_roster.html
+++ b/package.nw/gt_roster.html
@@ -177,11 +177,10 @@
                 <input type="checkbox" id="huntPOTA" onchange="wantedChanged(this);" />
                 <label data-i18n="roster.secondary.wanted.pota" for="huntPOTA" title="Parks On The Air">POTA</label>
               </div>
-               <div>
+               <div id="huntingMatrixOAMSDiv">
                 <input type="checkbox" id="huntOAMS" onchange="wantedChanged(this);" />
                 <label data-i18n="roster.secondary.wanted.OAMS" for="huntOAMS" title="Off-Air Message Service Users">OAMS</label>
               </div>
-
               <div>
               </div>
               <div>
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 633188f..d971f7d 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -10437,6 +10437,7 @@ function toggleGtShareEnable()
   else g_appSettings.gtShareEnable = true;
 
   setGtShareButtons();
+  goProcessRoster();
 }
 
 function setGtShareButtons()
@@ -10590,6 +10591,7 @@ function setMsgEnable(checkbox)
       }
     }
   }
+  goProcessRoster();
   g_gtLiveStatusUpdate = true;
   setMsgSettingsView();
 }
@@ -10723,11 +10725,11 @@ function renderBandActivity()
 
             if (place.oamsRx > 0)
             {
-              place.oamsScore = parseInt((place.oamsDecodes > place.oamsRxSpots) ? (place.oamsDecodes / place.oamsRx) + (place.oamsTxSpots * place.oamsTx) : (place.oamsRxSpots / place.oamsRx) + (place.oamsTxSpots * place.oamsTx));
+              place.oamsScore = parseInt((place.oamsDecodes > place.oamsRxSpots) ? (place.oamsDecodes / place.oamsRx) + (place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0) : (place.oamsRxSpots / place.oamsRx) + (place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0));
             }
             else
             {
-              place.oamsScore = parseInt(place.oamsTxSpots * place.oamsTx);
+              place.oamsScore = parseInt(place.oamsTx > 0 ? place.oamsTxSpots / place.oamsTx : 0);
             }
             if (maxValue < place.oamsScore) maxValue = place.oamsScore;
           }
@@ -10808,10 +10810,7 @@ function pskGetBandActivity()
   if (myMode.length > 0 && myDEGrid.length > 0 && g_timeNow > g_bandActivity.lastUpdate[myMode])
   {
     getBuffer(
-      "https://pskreporter.info/cgi-bin/psk-freq.pl?mode=" +
-      myMode +
-      "&grid=" +
-      myDEGrid.substr(0, 4),
+      "https://pskreporter.info/cgi-bin/psk-freq.pl?mode=" + myMode + "&grid=" + myDEGrid.substr(0, 4) + "&cb=" + timeNowSec(),
       pskBandActivityCallback,
       null,
       "https",
diff --git a/package.nw/lib/roster/renderRoster.js b/package.nw/lib/roster/renderRoster.js
index f571efb..f75702b 100644
--- a/package.nw/lib/roster/renderRoster.js
+++ b/package.nw/lib/roster/renderRoster.js
@@ -33,6 +33,16 @@ function renderRoster(callRoster, rosterSettings)
     columnOverrides.LoTW = false;
   }
 
+  if (rosterSettings.canMsg == true)
+  {
+    huntingMatrixOAMSDiv.style.display = "";
+  }
+  else
+  {
+    huntingMatrixOAMSDiv.style.display = "none";
+    columnOverrides.OAMS = false;
+  }
+
   if (window.opener.g_appSettings.potaEnabled === 1)
   {
     huntingMatrixPotaDiv.style.display = "";