diff --git a/CHANGELIST.md b/CHANGELIST.md
index 2f311eed..71aeaad1 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -1,6 +1,7 @@
 ### WIP (xxxx-xx-xx)
 
 - Simplify Redumper error value extraction
+- Don't pull comment fields that auto-populate
 
 ### 2.6 (2023-07-14)
 
diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs
index 3c2b8c8a..68625c66 100644
--- a/MPF.Library/InfoTool.cs
+++ b/MPF.Library/InfoTool.cs
@@ -2051,12 +2051,20 @@ namespace MPF.Library
                         // Skip certain site codes because of data issues
                         switch (siteCode)
                         {
+                            // Multiple
+                            case SiteCode.InternalSerialName:
+                            case SiteCode.Multisession:
+                            case SiteCode.VolumeLabel:
+                                foundTag = true;
+                                break;
+
                             // Audio CD
+                            case SiteCode.RingNonZeroDataStart:
                             case SiteCode.UniversalHash:
                                 foundTag = true;
                                 continue;
 
-                            // Xbox and X360
+                            // Microsoft Xbox and Xbox 360
                             case SiteCode.DMIHash:
                             case SiteCode.PFIHash:
                             case SiteCode.SSHash:
@@ -2065,6 +2073,16 @@ namespace MPF.Library
                             case SiteCode.XeMID:
                                 foundTag = true;
                                 continue;
+
+                            // Microsoft Xbox One and Series X/S
+                            case SiteCode.Filename:
+                                foundTag = true;
+                                break;
+
+                            // Nintendo Gamecube
+                            case SiteCode.InternalName:
+                                foundTag = true;
+                                break;
                         }
 
                         // Cache the current site code