diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json
index d8c44c281..36d278de5 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json
@@ -518,6 +518,11 @@
           "filter": "self,attachedTo(any)"
         },
         "cost": [
+          {
+            "type": "memorize",
+            "filter": "bearer",
+            "memory": "bearer"
+          },
           {
             "type": "transferToSupport",
             "filter": "self"
@@ -527,11 +532,11 @@
           "type": "conditional",
           "condition": {
             "type": "canSpot",
-            "filter": "inSkirmish,mounted,orc"
+            "filter": "inSkirmish,hasAttached(mount),orc"
           },
           "effect": {
             "type": "cancelSkirmish",
-            "filter": "bearer"
+            "filter": "memory(bearer)"
           }
         }
       }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json
index b3464c9d2..4cf81e197 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-shadow.json
@@ -265,7 +265,7 @@
     }
   },
   "31_25": {
-    "title": "Savage Worg",
+    "title": "Savage Warg",
     "culture": "gundabad",
     "cost": 3,
     "type": "possession",
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json
index 91486e7c1..7b9dcb1b3 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json
@@ -110,7 +110,7 @@
       "type": "modifier",
       "modifier": {
         "type": "modifyStrength",
-        "filter": "bearer,inSkirmishAgainst(mounted,minion)",
+        "filter": "bearer,inSkirmishAgainst(hasAttached(mount),minion)",
         "amount": 1
       }
     }
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json
index 54d69498b..d4fe66ef0 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-shadow.json
@@ -455,7 +455,7 @@
         "phase": "regroup",
         "condition": {
           "type": "cantSpot",
-          "filter": "self,mounted"
+          "filter": "self,hasAttached(mount)"
         },
         "cost": {
           "type": "exert",
@@ -640,7 +640,7 @@
         "phase": "regroup",
         "condition": {
           "type": "cantSpot",
-          "filter": "self,mounted"
+          "filter": "self,hasAttached(mount)"
         },
         "cost": {
           "type": "exert",
@@ -738,7 +738,7 @@
         "phase": "regroup",
         "condition": {
           "type": "cantSpot",
-          "filter": "self,mounted"
+          "filter": "self,hasAttached(mount)"
         },
         "cost": {
           "type": "exert",