diff --git a/forge-gui/res/cardsfolder/s/skyclave_apparition.txt b/forge-gui/res/cardsfolder/s/skyclave_apparition.txt
index 3fd918bd8f0..7604ad22861 100755
--- a/forge-gui/res/cardsfolder/s/skyclave_apparition.txt
+++ b/forge-gui/res/cardsfolder/s/skyclave_apparition.txt
@@ -4,8 +4,8 @@ Types:Creature Kor Spirit
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one target nonland, nontoken permanent you don't control with converted mana cost 4 or less.
 SVar:TrigExile:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand+nonToken+YouDontCtrl+cmcLE4 | TgtPrompt$ Select target nonland, nontoken permanent you don't control with converted mana cost 4 or less. | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile up to one target nonland, nontoken permanent you don't control with converted mana cost 4 or less.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME leaves the battlefield, the exiled card's owner creates an X/X blue Illusion creature token, where X is the converted mana cost of the exiled card.
-#TODO fix exiling from multiple players
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_x_x_illusion | TokenOwner$ ExiledWithOwner | TokenPower$ X | TokenToughness$ X
-SVar:X:ExiledWith$SumCMC
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBRepeat | TriggerDescription$ When CARDNAME leaves the battlefield, the exiled card's owner creates an X/X blue Illusion creature token, where X is the converted mana cost of the exiled card.
+SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ ExiledWithOwner | RepeatSubAbility$ TrigToken
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ u_x_x_illusion | TokenOwner$ Remembered | TokenPower$ X | TokenToughness$ X
+SVar:X:ExiledWith$FilterControlledByRemembered_CardManaCost
 Oracle:When Skyclave Apparition enters the battlefield, exile up to one target nonland, nontoken permanent you don't control with converted mana cost 4 or less.\nWhen Skyclave Apparition leaves the battlefield, the exiled card's owner creates an X/X blue Illusion creature token, where X is the converted mana cost of the exiled card.
diff --git a/forge-gui/res/cardsfolder/s/spell_queller.txt b/forge-gui/res/cardsfolder/s/spell_queller.txt
index 3fc23ffbb4c..2844ad1f441 100644
--- a/forge-gui/res/cardsfolder/s/spell_queller.txt
+++ b/forge-gui/res/cardsfolder/s/spell_queller.txt
@@ -6,7 +6,7 @@ K:Flash
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target spell with converted mana cost 4 or less.
 SVar:TrigExile:DB$ ChangeZone | TargetType$ Spell | ValidTgts$ Card.cmcLE4 | TgtZone$ Stack | Origin$ Stack | Fizzle$ True | Mandatory$ True | Destination$ Exile | IsCurse$ True | TgtPrompt$ Choose target spell with converted mana cost 4 or less
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ TrigPlay | TriggerDescription$ When Spell Queller leaves the battlefield, the exiled card's owner may cast that card without paying its mana cost.
-# TODO fix it when it exiles cards from multiple players
-SVar:TrigPlay:DB$ Play | Defined$ ExiledWith | Controller$ ExiledWithOwner | WithoutManaCost$ True | Optional$ True
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBRepeat | TriggerDescription$ When Spell Queller leaves the battlefield, the exiled card's owner may cast that card without paying its mana cost.
+SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ ExiledWithOwner | RepeatSubAbility$ TrigPlay
+SVar:TrigPlay:DB$ Play | Defined$ ExiledWith.OwnedBy Remembered | Controller$ Remembered | WithoutManaCost$ True | Optional$ True
 Oracle:Flash\nFlying\nWhen Spell Queller enters the battlefield, exile target spell with converted mana cost 4 or less.\nWhen Spell Queller leaves the battlefield, the exiled card's owner may cast that card without paying its mana cost.