diff --git a/CoaExporter/Catalogs/Common.lua b/CoaExporter/Catalogs/Common.lua
index 0de7efc..d1a7e77 100644
--- a/CoaExporter/Catalogs/Common.lua
+++ b/CoaExporter/Catalogs/Common.lua
@@ -166,9 +166,17 @@ function C.Run(filter, callback)
                     end
                 end
 
+                -- Only tooltip-scan entries with a backing spell. Advancement
+                -- IDs are NOT spell IDs - SetHyperlink("spell:" .. entry.ID)
+                -- would alias them into real 3.3.5 spell-ID space and capture
+                -- some unrelated spell's tooltip (and adopt its first line as
+                -- the entry name).
                 local name, _, icon
-                if spellId > 0 then name, _, icon = GetSpellInfo(spellId) end
-                local tooltip = GetCatalogTooltip(spellId > 0 and spellId or entry.ID)
+                local tooltip = ""
+                if spellId > 0 then
+                    name, _, icon = GetSpellInfo(spellId)
+                    tooltip = GetCatalogTooltip(spellId)
+                end
                 if not name or name == "" then
                     name = tooltip:match("^([^\n]+)") or ("ID:" .. tostring(entry.ID))
                 end