diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index d73b09f..c1af617 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -5,18 +5,16 @@ const pjson = require("./package.json");
 var gtVersionStr = pjson.version
 var gtVersion = parseInt(gtVersionStr.replace(/\./g, ""));
 var gtBeta = pjson.betaVersion;
-
 var g_startVersion = 0;
+
 if (typeof localStorage.currentVersion != "undefined")
 {
-  g_startVersion = localStorage.currentVersion;
+  g_startVersion = parseInt(localStorage.currentVersion);
 }
 
 if (typeof localStorage.currentVersion == "undefined" || localStorage.currentVersion != String(gtVersion))
 {
   localStorage.currentVersion = String(gtVersion);
-  var gui = require("nw.gui");
-  gui.App.clearCache();
 }
 
 var vers = String(gtVersion);
@@ -6648,6 +6646,10 @@ function handleWsjtxDecode(newMessage)
     {
       msgDXcallsign += " " + decodeWords[1];
     }
+    if (decodeWords.length == 3 && CQ == true && validQTH == false)
+    {
+      msgDXcallsign += " " + decodeWords[1];
+    }
     if (decodeWords.length == 3 && CQ == false)
     {
       msgDXcallsign = decodeWords[0];
@@ -6685,17 +6687,7 @@ function handleWsjtxDecode(newMessage)
         g_appSettings.gtModeFilter == "Digital")
     )
     {
-      rect = qthToBox(
-        theirQTH,
-        msgDEcallsign,
-        CQ,
-        false,
-        msgDXcallsign,
-        newMessage.OB,
-        null,
-        hash
-      );
-
+      rect = qthToBox(theirQTH, msgDEcallsign, CQ,false, msgDXcallsign, newMessage.OB, null, hash);
       canPath = true;
     }
 
@@ -6711,7 +6703,7 @@ function handleWsjtxDecode(newMessage)
 
     if (callsign == null)
     {
-      newCallsign = {};
+      let newCallsign = {};
       newCallsign.DEcall = msgDEcallsign;
       newCallsign.grid = theirQTH;
       newCallsign.wspr = null;
@@ -15359,7 +15351,8 @@ function mediaCheck()
 
   try
   {
-    if (fs.existsSync(g_NWappData + "internal_qso.json"))
+    let fileExists = fs.existsSync(g_NWappData + "internal_qso.json");
+    if (fileExists == true && g_startVersion > 1221123)
     {
       var data = JSON.parse(fs.readFileSync(g_NWappData + "internal_qso.json"));
       g_tracker = data.tracker;
@@ -15385,6 +15378,10 @@ function mediaCheck()
   
       fs.unlinkSync(g_NWappData + "internal_qso.json");
     }
+    else if (fileExists == true)
+    {
+      fs.unlinkSync(g_NWappData + "internal_qso.json");
+    }
 
     loadReceptionReports();
   }