diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java
index 6d182f77b..c2b9a1129 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/dwarven/Card1_024.java
@@ -7,7 +7,6 @@ import com.gempukku.lotro.filters.Filter;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.GameState;
-import com.gempukku.lotro.game.state.Skirmish;
 import com.gempukku.lotro.logic.modifiers.Modifier;
 import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
 
@@ -30,13 +29,11 @@ public class Card1_024 extends AbstractPermanent {
         return new StrengthModifier(self,
                 Filters.and(
                         Filters.race(Race.DWARF),
+                        Filters.inSkirmish(),
                         new Filter() {
                             @Override
                             public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
-                                Skirmish skirmish = gameState.getSkirmish();
-                                return (skirmish != null)
-                                        && (skirmish.getFellowshipCharacter() == physicalCard)
-                                        && (Filters.filter(skirmish.getShadowCharacters(), gameState, modifiersQuerying, Filters.culture(Culture.MORIA)).size() > 0);
+                                return Filters.canSpot(gameState, modifiersQuerying, Filters.culture(Culture.MORIA), Filters.type(CardType.MINION), Filters.inSkirmish());
                             }
                         }), 1);
     }
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java
index 01d627347..819d594f0 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_030.java
@@ -10,7 +10,6 @@ import com.gempukku.lotro.filters.Filter;
 import com.gempukku.lotro.filters.Filters;
 import com.gempukku.lotro.game.PhysicalCard;
 import com.gempukku.lotro.game.state.GameState;
-import com.gempukku.lotro.game.state.Skirmish;
 import com.gempukku.lotro.logic.modifiers.Modifier;
 import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
 
@@ -35,14 +34,14 @@ public class Card1_030 extends AbstractCompanion {
     @Override
     public Modifier getAlwaysOnEffect(final PhysicalCard self) {
         return new StrengthModifier(self,
-                new Filter() {
-                    @Override
-                    public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
-                        Skirmish activeSkirmish = gameState.getSkirmish();
-                        return (activeSkirmish != null
-                                && activeSkirmish.getFellowshipCharacter().equals(self)
-                                && Filters.filter(activeSkirmish.getShadowCharacters(), gameState, modifiersQuerying, Filters.race(Race.NAZGUL)).size() > 0);
-                    }
-                }, 3);
+                Filters.and(
+                        Filters.sameCard(self),
+                        Filters.inSkirmish(),
+                        new Filter() {
+                            @Override
+                            public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
+                                return Filters.canSpot(gameState, modifiersQuerying, Filters.race(Race.NAZGUL), Filters.inSkirmish());
+                            }
+                        }), 3);
     }
 }
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java
index f92a01227..3dcfb0ddb 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/elven/Card1_032.java
@@ -40,7 +40,7 @@ public class Card1_032 extends AbstractEvent {
                         Skirmish skirmish = game.getGameState().getSkirmish();
                         int bonus = 2;
                         if (skirmish != null) {
-                            if (skirmish.getFellowshipCharacter() == elf && Filters.filter(skirmish.getShadowCharacters(), game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.ARCHER)).size() > 0)
+                            if (skirmish.getFellowshipCharacter() == elf && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.type(CardType.MINION), Filters.keyword(Keyword.ARCHER)))
                                 bonus = 4;
                         }