diff --git a/Source/Game/Achievements/CriteriaHandler.cs b/Source/Game/Achievements/CriteriaHandler.cs
index cbf3222d2..b08690629 100644
--- a/Source/Game/Achievements/CriteriaHandler.cs
+++ b/Source/Game/Achievements/CriteriaHandler.cs
@@ -4277,6 +4277,7 @@ namespace Game.Achievements
                     {
                         Log.outError(LogFilter.Sql, "Table `criteria_data` (Entry: {0} Type: {1}) for data type CRITERIA_DATA_TYPE_MAP_ID ({2}) contains an unknown map entry in value1 ({3}), ignored.",
                             criteria.Id, criteria.Entry.Type, DataType, MapId.Id);
+                        return false;
                     }
                     return true;
                 case CriteriaDataType.SPlayerClassRace:
diff --git a/Source/Game/Spells/Auras/Aura.cs b/Source/Game/Spells/Auras/Aura.cs
index ff7d7e391..5a94fcfe5 100644
--- a/Source/Game/Spells/Auras/Aura.cs
+++ b/Source/Game/Spells/Auras/Aura.cs
@@ -2588,7 +2588,7 @@ namespace Game.Spells
                             selectionType = SpellTargetCheckTypes.Enemy;
                             break;
                         case SpellEffectName.ApplyAreaAuraPet:
-                            if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), caster, condList))
+                            if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), refe, condList))
                                 targetList.Add(GetUnitOwner());
                             goto case SpellEffectName.ApplyAreaAuraOwner;
                         case SpellEffectName.ApplyAreaAuraOwner:
@@ -2596,7 +2596,7 @@ namespace Game.Spells
                             Unit owner = GetUnitOwner().GetCharmerOrOwner();
                             if (owner != null)
                                 if (GetUnitOwner().IsWithinDistInMap(owner, radius))
-                                    if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(owner, caster, condList))
+                                    if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(owner, refe, condList))
                                         targetList.Add(owner);
                             break;
                         }
@@ -2604,13 +2604,13 @@ namespace Game.Spells
                         {
                             Unit pet = Global.ObjAccessor.GetUnit(GetUnitOwner(), GetUnitOwner().GetPetGUID());
                             if (pet != null)
-                                if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(pet, caster, condList))
+                                if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(pet, refe, condList))
                                     targetList.Add(pet);
                             break;
                         }
                         case SpellEffectName.ApplyAreaAuraSummons:
                         {
-                            if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), caster, condList))
+                            if (condList == null || Global.ConditionMgr.IsObjectMeetToConditions(GetUnitOwner(), refe, condList))
                                 targetList.Add(GetUnitOwner());
 
                             selectionType = SpellTargetCheckTypes.Summoned;
@@ -2620,7 +2620,7 @@ namespace Game.Spells
 
                     if (selectionType != SpellTargetCheckTypes.Default)
                     {
-                        WorldObjectSpellAreaTargetCheck check = new(radius, GetUnitOwner(), caster, caster, GetSpellInfo(), selectionType, condList, SpellTargetObjectTypes.Unit);
+                        WorldObjectSpellAreaTargetCheck check = new(radius, GetUnitOwner(), refe, GetUnitOwner(), GetSpellInfo(), selectionType, condList, SpellTargetObjectTypes.Unit);
                         UnitListSearcher searcher = new(GetUnitOwner(), targetList, check);
                         Cell.VisitAllObjects(GetUnitOwner(), searcher, radius);