diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index faa145d..290c6c3 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -2604,7 +2604,7 @@ Private.event_prototypes = {
         name = "spellName",
         display = L["Spell Name"],
         type = "spell",
-        --noValidation = true,
+        noValidation = true,
         init = "arg",
         enable = function(trigger)
           return trigger.subeventPrefix and (trigger.subeventPrefix:find("SPELL") or trigger.subeventPrefix == "RANGE" or trigger.subeventPrefix:find("DAMAGE"))
@@ -2667,6 +2667,7 @@ Private.event_prototypes = {
         name = "extraSpellName",
         display = L["Extra Spell Name"],
         type = "string",
+        noValidation = true,
         init = "arg",
         enable = function(trigger)
           return trigger.subeventSuffix and (trigger.subeventSuffix == "_INTERRUPT" or trigger.subeventSuffix == "_DISPEL" or trigger.subeventSuffix == "_DISPEL_FAILED" or trigger.subeventSuffix == "_STOLEN" or trigger.subeventSuffix == "_AURA_BROKEN_SPELL")
@@ -5764,9 +5765,9 @@ Private.event_prototypes = {
           operator = "preamble",
           preambleAdd = "spellChecker:AddName(%q)"
         },
-        test = "spellChecker:Check(spellId)",
         testGroup = "spell",
-        --noValidation = true,
+        test = "spellChecker:CheckName(spell)",
+        noValidation = true,
       },
       {
         name = "spellIds",
@@ -5777,10 +5778,9 @@ Private.event_prototypes = {
         preamble = "local spellChecker = WeakAuras.CreateSpellChecker()",
         multiEntry = {
           operator = "preamble",
-          preambleAdd = "spellChecker:AddExact(%q)"
+          preambleAdd = "spellChecker:AddName(GetSpellInfo(%q))"
         },
-        test = "spellChecker:Check(spellId)",
-        testGroup = "spell",
+        test = "spellChecker:CheckName(spell)",
       },
       {
         name = "spellId",