diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java
index 0903f6b51..8ae452c99 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/site/Card1_331.java
@@ -42,7 +42,7 @@ public class Card1_331 extends AbstractSite {
                         protected void forEachCardExertedCallback(PhysicalCard character) {
                             action.appendEffect(
                                     new AddUntilEndOfPhaseModifierEffect(
-                                            new StrengthModifier(self, Filters.sameCard(character), 2), Phase.SKIRMISH));
+                                            new StrengthModifier(self, character, 2), Phase.SKIRMISH));
                         }
                     });
             return Collections.singletonList(action);
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
index c60f56e35..ad1bda873 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
@@ -363,9 +363,10 @@ public class GameState {
             Zone zone = card.getZone();
 
             if (zone.isInPlay())
-                stopAffecting(card);
-            else if (zone == Zone.STACKED)
-                stopAffectingStacked(card);
+                if (card.getBlueprint().getCardType() != CardType.SITE || (getCurrentPhase() != Phase.GAME_SETUP && getCurrentSite() == card))
+                    stopAffecting(card);
+                else if (zone == Zone.STACKED)
+                    stopAffectingStacked(card);
 
             List<PhysicalCardImpl> zoneCards = getZoneCards(card.getOwner(), card.getBlueprint().getCardType(), zone);
             boolean b = zoneCards.remove(card);
@@ -444,7 +445,7 @@ public class GameState {
         }
 
         if (zone.isInPlay()) {
-            if (zone != Zone.ADVENTURE_PATH || _currentPhase != Phase.GAME_SETUP)
+            if (card.getBlueprint().getCardType() != CardType.SITE || (getCurrentPhase() != Phase.GAME_SETUP && getCurrentSite() == card))
                 startAffecting(game, card);
         } else if (zone == Zone.STACKED)
             startAffectingStacked(game, card);
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
index e5f52c152..17ea86114 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
@@ -70,6 +70,10 @@ var Card = Class.extend({
             return (cardNo >= 115 && cardNo <= 120);
         if (setNo == 4)
             return (cardNo >= 323 && cardNo <= 363);
+        if (setNo == 5)
+            return (cardNo >= 118 && cardNo <= 120);
+        if (setNo == 6)
+            return (cardNo >= 115 && cardNo <= 120);
     },
 
     getUrlByBlueprintId: function(blueprintId) {