diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/GameStats.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/GameStats.java
index 2a2f8ff74..0d63d70af 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/GameStats.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/GameStats.java
@@ -1,6 +1,7 @@
 package com.gempukku.lotro.logic.timing;
 
 import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Phase;
 import com.gempukku.lotro.common.Signet;
 import com.gempukku.lotro.common.Zone;
 import com.gempukku.lotro.filters.Filters;
@@ -15,8 +16,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class GameStats {
-    private int _fellowshipArchery;
-    private int _shadowArchery;
+    private Integer _fellowshipArchery;
+    private Integer _shadowArchery;
 
     private int _moveLimit;
     private int _moveCount;
@@ -42,16 +43,24 @@ public class GameStats {
     public boolean updateGameStats(LotroGame game) {
         boolean changed = false;
 
-        int newFellowshipArcheryTotal = RuleUtils.calculateFellowshipArcheryTotal(game);
-        if (newFellowshipArcheryTotal != _fellowshipArchery) {
-            changed = true;
-            _fellowshipArchery = newFellowshipArcheryTotal;
-        }
+        if (game.getGameState().getCurrentPhase() == Phase.ARCHERY) {
+            int newFellowshipArcheryTotal = RuleUtils.calculateFellowshipArcheryTotal(game);
+            if (newFellowshipArcheryTotal != _fellowshipArchery) {
+                changed = true;
+                _fellowshipArchery = newFellowshipArcheryTotal;
+            }
 
-        int newShadowArcheryTotal = RuleUtils.calculateShadowArcheryTotal(game);
-        if (newShadowArcheryTotal != _shadowArchery) {
-            changed = true;
-            _shadowArchery = newShadowArcheryTotal;
+            int newShadowArcheryTotal = RuleUtils.calculateShadowArcheryTotal(game);
+            if (newShadowArcheryTotal != _shadowArchery) {
+                changed = true;
+                _shadowArchery = newShadowArcheryTotal;
+            }
+        } else {
+            if (_fellowshipArchery != null || _shadowArchery != null) {
+                changed = true;
+                _fellowshipArchery = null;
+                _shadowArchery = null;
+            }
         }
 
         int newMoveLimit = RuleUtils.calculateMoveLimit(game);
@@ -190,11 +199,11 @@ public class GameStats {
         return changed;
     }
 
-    public int getFellowshipArchery() {
+    public Integer getFellowshipArchery() {
         return _fellowshipArchery;
     }
 
-    public int getShadowArchery() {
+    public Integer getShadowArchery() {
         return _shadowArchery;
     }
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/cardFilter.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/cardFilter.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/cardFilter.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/cardFilter.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/chat.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/chat.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/chat.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/chat.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/common.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/common.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/common.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/common.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/commonUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/commonUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/commonUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/commonUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/communication.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/communication.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/communication.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/communication.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deckBuildingUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/deckBuildingUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deckBuildingUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/deliveryService.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deliveryService.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/deliveryService.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/deliveryService.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/gameAnimations.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/gameAnimations.js
similarity index 96%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/gameAnimations.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/gameAnimations.js
index ef63de268..0f8a2e963 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/gameAnimations.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/gameAnimations.js
@@ -775,8 +775,15 @@ var GameAnimations = Class.extend({
                     var moveCount = element.getAttribute("moveCount");
                     var moveLimit = element.getAttribute("moveLimit");
 
-                    $(".fpArchery").html(fellowshipArchery);
-                    $(".shadowArchery").html(shadowArchery);
+                    if (fellowshipArchery == "null")
+                        $(".fpArchery").html("");
+                    else
+                        $(".fpArchery").html(fellowshipArchery);
+                    if (shadowArchery == "null")
+                        $(".shadowArchery").html("");
+                    else
+                        $(".shadowArchery").html(shadowArchery);
+
                     $(".move").html(moveCount + "/" + moveLimit);
 
                     var playerZones = element.getElementsByTagName("playerZones");
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/gameHistoryUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/gameHistoryUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/gameHistoryUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/gameHistoryUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/gameUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/gameUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/gameUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/hallUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/hallUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/hallUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/hallUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/inheritance.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/inheritance.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/inheritance.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/inheritance.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/jCardGroup.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/jCardGroup.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/jCardGroup.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/jCards.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/jCards.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/jCards.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/leagueResultsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/leagueResultsUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/leagueResultsUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/leagueResultsUi.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/logging.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/logging.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/logging.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/logging.js
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/merchantUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/merchantUi.js
similarity index 100%
rename from gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-001/merchantUi.js
rename to gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-002/merchantUi.js