diff --git a/ObservatoryExplorer/CustomCriteriaManager.cs b/ObservatoryExplorer/CustomCriteriaManager.cs
index f52be76..0015c8c 100644
--- a/ObservatoryExplorer/CustomCriteriaManager.cs
+++ b/ObservatoryExplorer/CustomCriteriaManager.cs
@@ -160,9 +160,9 @@ namespace Observatory.Explorer
             }
         }
 
-        public List<(string, string)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings)
+        public List<(string, string, bool)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings)
         {
-            List<(string, string)> results = new();
+            List<(string, string, bool)> results = new();
            
             foreach (var criteriaFunction in CriteriaFunctions)
             {
@@ -210,13 +210,13 @@ namespace Observatory.Explorer
                     var result = criteriaFunction.Call(scan, parents, scanList, bioSignals, geoSignals);
                     if (result.Length > 0 && ((bool?)result[0]).GetValueOrDefault(false))
                     {
-                        results.Add((result[1].ToString(), result[2].ToString()));
+                        results.Add((result[1].ToString(), result[2].ToString(), false));
                     }
                 }
                 catch (NLua.Exceptions.LuaScriptException e)
                 {
                     settings.EnableCustomCriteria = false;
-                    results.Add((e.Message, scan.Json));
+                    results.Add((e.Message, scan.Json, false));
                     break;
                 }
             }
diff --git a/ObservatoryExplorer/DefaultCriteria.cs b/ObservatoryExplorer/DefaultCriteria.cs
index 33da814..5dc5579 100644
--- a/ObservatoryExplorer/DefaultCriteria.cs
+++ b/ObservatoryExplorer/DefaultCriteria.cs
@@ -9,9 +9,9 @@ namespace Observatory.Explorer
 {
     internal static class DefaultCriteria
     {
-        public static List<(string Description, string Detail)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings)
+        public static List<(string Description, string Detail, bool SystemWide)> CheckInterest(Scan scan, Dictionary<ulong, Dictionary<int, Scan>> scanHistory, Dictionary<ulong, Dictionary<int, FSSBodySignals>> signalHistory, ExplorerSettings settings)
         {
-            List<(string, string)> results = new();
+            List<(string, string, bool)> results = new();
             TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
 
             bool isRing = scan.BodyName.Contains("Ring");
@@ -136,11 +136,11 @@ namespace Observatory.Explorer
                     {
                         if (settings.CollidingBinary && binaryPartner.First().Value.Radius + scan.Radius >= binaryPartner.First().Value.SemiMajorAxis * (1 - binaryPartner.First().Value.Eccentricity) + scan.SemiMajorAxis * (1 - scan.Eccentricity))
                         {
-                            results.Add(("COLLIDING binary", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}"));
+                            results.Add("COLLIDING binary", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}");
                         }
                         else if (settings.CloseBinary)
                         {
-                            results.Add(("Close binary relative to body size", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}"));
+                            results.Add("Close binary relative to body size", $"Orbit: {Math.Truncate((double)scan.SemiMajorAxis / 1000):N0}km, Radius: {Math.Truncate((double)scan.Radius / 1000):N0}km, Partner: {binaryPartner.First().Value.BodyName}");
                         }
                     }
                 }
@@ -215,10 +215,10 @@ namespace Observatory.Explorer
                 }
 
                 if (notifyGreen)
-                    results.Add("All Premium Boost Materials In System");
+                    results.Add("All Premium Boost Materials In System", string.Empty, true);
 
                 if (notifyGold)
-                    results.Add("All Surface Materials In System");
+                    results.Add("All Surface Materials In System", string.Empty, true);
             }
 
             if (settings.UncommonSecondary && scan.BodyID > 0 && !string.IsNullOrWhiteSpace(scan.StarType) && scan.DistanceFromArrivalLS > 10)
@@ -347,9 +347,9 @@ namespace Observatory.Explorer
             return materials.Count;
         }
 
-        private static void Add(this List<(string, string)> results, string description, string detail = "")
+        private static void Add(this List<(string, string, bool)> results, string description, string detail = "", bool systemWide = false)
         {
-            results.Add((description, detail));
+            results.Add((description, detail, systemWide));
         }
     }
 }
diff --git a/ObservatoryExplorer/Explorer.cs b/ObservatoryExplorer/Explorer.cs
index ba5a572..ea6ec8b 100644
--- a/ObservatoryExplorer/Explorer.cs
+++ b/ObservatoryExplorer/Explorer.cs
@@ -192,7 +192,7 @@ namespace Observatory.Explorer
                 {
                     var scanResult = new ExplorerUIResults()
                     {
-                        BodyName = scanEvent.BodyName,
+                        BodyName = result.SystemWide ? scanEvent.StarSystem : scanEvent.BodyName,
                         Time = scanEvent.TimestampDateTime.ToString("G"),
                         Description = result.Description,
                         Details = result.Detail
@@ -233,6 +233,7 @@ namespace Observatory.Explorer
                 }
                 else
                 {
+                    bodyLabel = "Primary Star";
                     spokenAffix = string.Empty;
                 }