diff --git a/data/ai/micro_ais/scenarios/dragon.cfg b/data/ai/micro_ais/scenarios/dragon.cfg
index 4287df3121a8..5f05edfaee2b 100644
--- a/data/ai/micro_ais/scenarios/dragon.cfg
+++ b/data/ai/micro_ais/scenarios/dragon.cfg
@@ -65,7 +65,9 @@
             ai_type=hunter
             action=add
 
-            id=Rowck
+            [filter]
+                id=Rowck
+            [/filter]
             [filter_location]
                 x,y=5-30,1-15
             [/filter_location]
diff --git a/data/ai/micro_ais/scenarios/goto.cfg b/data/ai/micro_ais/scenarios/goto.cfg
index c7909aaf0700..fa74bd2c498d 100644
--- a/data/ai/micro_ais/scenarios/goto.cfg
+++ b/data/ai/micro_ais/scenarios/goto.cfg
@@ -566,7 +566,9 @@ Note: The messengers are controlled by Goto Micro AI definitions that differ by
         [filter]
             id=messenger1,messenger2
             x,y=6-7,2-4
-            terrain=C*
+            [filter_location]
+                terrain=C*
+            [/filter_location]
         [/filter]
 
         [message]
diff --git a/data/ai/micro_ais/scenarios/guardians.cfg b/data/ai/micro_ais/scenarios/guardians.cfg
index d04bf81985a9..ca23e18adf6f 100644
--- a/data/ai/micro_ais/scenarios/guardians.cfg
+++ b/data/ai/micro_ais/scenarios/guardians.cfg
@@ -131,7 +131,9 @@
             ai_type=coward
             action=add
 
-            id=coward1
+            [filter]
+                id=coward1
+            [/filter]
             distance=5
         [/micro_ai]
 
@@ -154,7 +156,9 @@
             ai_type=coward
             action=add
 
-            id=coward2
+            [filter]
+                id=coward2
+            [/filter]
             distance=5
             seek_x,seek_y=24,5
         [/micro_ai]
@@ -178,7 +182,9 @@
             ai_type=coward
             action=add
 
-            id=coward3
+            [filter]
+                id=coward3
+            [/filter]
             distance=5
             seek_x,seek_y=24,5
             avoid_x,avoid_y=24,15
@@ -203,7 +209,9 @@
             ai_type=coward
             action=add
 
-            id=coward4
+            [filter]
+                id=coward4
+            [/filter]
             distance=4
             seek_x=32
         [/micro_ai]
@@ -228,7 +236,9 @@
             ai_type=return_guardian
             action=add
 
-            id=return1
+            [filter]
+                id=return1
+            [/filter]
             return_x,return_y=20,2
         [/micro_ai]
 
@@ -247,7 +257,9 @@
             ai_type=return_guardian
             action=add
 
-            id=return2
+            [filter]
+                id=return2
+            [/filter]
             return_x,return_y=21,9
         [/micro_ai]
 
@@ -293,7 +305,9 @@ s=2,14 g=3,13"
             ai_type=stationed_guardian
             action=add
 
-            id=stationed1
+            [filter]
+                id=stationed1
+            [/filter]
             distance=4
             station_x,station_y=2,14
             guard_x,guard_y=3,13
@@ -315,7 +329,9 @@ s=4,14 g=7,13"
             ai_type=stationed_guardian
             action=add
 
-            id=stationed2
+            [filter]
+                id=stationed2
+            [/filter]
             distance=4
             station_x,station_y=4,14
             guard_x,guard_y=3,13
@@ -340,7 +356,9 @@ s=4,14 g=7,13"
             ai_type=zone_guardian
             action=add
 
-            id=zone1
+            [filter]
+                id=zone1
+            [/filter]
             [filter_location]
                 x=4,5,6,7,5
                 y=24,24,24,24,25
@@ -366,7 +384,9 @@ separate attack Zone"
             ai_type=zone_guardian
             action=add
 
-            id=zone2
+            [filter]
+                id=zone2
+            [/filter]
             [filter_location]
                 x=1,2,3,2
                 y=27,27,27,26
@@ -391,7 +411,9 @@ separate attack Zone"
             ai_type=zone_guardian
             action=add
 
-            id=zone3
+            [filter]
+                id=zone3
+            [/filter]
             [filter_location]
                 x,y=22-31,4-11  # This is intentionally chosen to extend past the lake
                 terrain=W*
diff --git a/data/ai/micro_ais/scenarios/hang_out.cfg b/data/ai/micro_ais/scenarios/hang_out.cfg
index 807a2bf13c96..bc237b897797 100644
--- a/data/ai/micro_ais/scenarios/hang_out.cfg
+++ b/data/ai/micro_ais/scenarios/hang_out.cfg
@@ -102,7 +102,9 @@
             ai_type=messenger_escort
             action=add
 
-            id=Bad Outlaw
+            [filter]
+                id=Bad Outlaw
+            [/filter]
             ca_score=165000
             waypoint_x=16,22,36
             waypoint_y=19,19,19
diff --git a/data/ai/micro_ais/scenarios/messenger_escort.cfg b/data/ai/micro_ais/scenarios/messenger_escort.cfg
index 416e47197976..2e55819790a7 100644
--- a/data/ai/micro_ais/scenarios/messenger_escort.cfg
+++ b/data/ai/micro_ais/scenarios/messenger_escort.cfg
@@ -59,7 +59,9 @@
             ai_type=messenger_escort
             action=add
 
-            id=messenger
+            [filter]
+                id=messenger
+            [/filter]
             waypoint_x=31,24,27,28
             waypoint_y=20,14,7,1
         [/micro_ai]
diff --git a/data/ai/micro_ais/scenarios/patrols.cfg b/data/ai/micro_ais/scenarios/patrols.cfg
index 08f6fc095a1a..0c713b753764 100644
--- a/data/ai/micro_ais/scenarios/patrols.cfg
+++ b/data/ai/micro_ais/scenarios/patrols.cfg
@@ -121,7 +121,9 @@
             ai_type=patrol
             action=add
 
-            id=Konrad
+            [filter]
+                id=Konrad
+            [/filter]
             ca_score=300000
             waypoint_x=9,24,25
             waypoint_y=21,23,15
@@ -134,7 +136,9 @@
             ai_type=patrol
             action=add
 
-            id=patrol1
+            [filter]
+                id=patrol1
+            [/filter]
             ca_score=299999
             waypoint_x=14,22,22,14,14
             waypoint_y=12,12,18,19,12
@@ -146,7 +150,9 @@
             ai_type=patrol
             action=add
 
-            id=patrol2
+            [filter]
+                id=patrol2
+            [/filter]
             ca_score=299998
             waypoint_x=14,14,22,22
             waypoint_y=12,19,18,12
@@ -166,7 +172,9 @@
             ai_type=zone_guardian
             action=add
 
-            id=guard1
+            [filter]
+                id=guard1
+            [/filter]
             ca_score=299997
             [filter_location]
                 x,y=10-26,26-28
diff --git a/data/ai/micro_ais/scenarios/protect_unit.cfg b/data/ai/micro_ais/scenarios/protect_unit.cfg
index 6cef9e480209..00ebb3d916b6 100644
--- a/data/ai/micro_ais/scenarios/protect_unit.cfg
+++ b/data/ai/micro_ais/scenarios/protect_unit.cfg
@@ -52,7 +52,6 @@
             [/goal]
         [/ai]
 
-        {ai/aliases/stable_singleplayer.cfg}
         [ai]
             [engine]
                 name="lua"