diff --git a/campaign/war_archives_20190620_en/sp1.py b/campaign/war_archives_20190620_en/sp1.py
index 39de127e2..fcee62aa5 100644
--- a/campaign/war_archives_20190620_en/sp1.py
+++ b/campaign/war_archives_20190620_en/sp1.py
@@ -4,24 +4,26 @@ from module.map.map_grids import SelectedGrids, RoadGrids
 from module.logger import logger
 
 MAP = CampaignMap('SP1')
-MAP.shape = 'H6'
-MAP.camera_data = ['D2', 'D4', 'E2', 'E4']
-MAP.camera_data_spawn_point = ['D4']
+MAP.shape = 'I7'
+MAP.camera_data = ['D2', 'D5', 'F2', 'F5']
+MAP.camera_data_spawn_point = ['D5']
 MAP.map_data = """
-    MB ME -- ++ -- -- ME --
-    MB ME ME Me ME ME ++ --
-    ++ ++ ++ ++ ++ ME -- ME
-    SP SP SP ++ ++ -- ME --
-    -- -- -- Me -- ME ++ ME
-    ++ -- -- -- Me -- ME --
+    MB -- ME ++ Me ME -- ME --
+    MB -- -- -- -- -- ++ -- ME
+    ++ ++ ++ ++ ++ -- ME -- --
+    SP SP SP ++ ++ -- -- -- ++
+    -- -- -- Me -- -- ++ -- ME
+    ++ -- -- -- -- -- ME -- ME
+    -- Me ME -- ME ME -- ME --
 """
 MAP.weight_data = """
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
-    50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
+    50 50 50 50 50 50 50 50 50
 """
 MAP.spawn_data = [
     {'battle': 0, 'enemy': 3, 'mystery': 1},
@@ -30,12 +32,13 @@ MAP.spawn_data = [
     {'battle': 3, 'enemy': 1},
     {'battle': 4, 'boss': 1},
 ]
-A1, B1, C1, D1, E1, F1, G1, H1, \
-A2, B2, C2, D2, E2, F2, G2, H2, \
-A3, B3, C3, D3, E3, F3, G3, H3, \
-A4, B4, C4, D4, E4, F4, G4, H4, \
-A5, B5, C5, D5, E5, F5, G5, H5, \
-A6, B6, C6, D6, E6, F6, G6, H6, \
+A1, B1, C1, D1, E1, F1, G1, H1, I1, \
+A2, B2, C2, D2, E2, F2, G2, H2, I2, \
+A3, B3, C3, D3, E3, F3, G3, H3, I3, \
+A4, B4, C4, D4, E4, F4, G4, H4, I4, \
+A5, B5, C5, D5, E5, F5, G5, H5, I5, \
+A6, B6, C6, D6, E6, F6, G6, H6, I6, \
+A7, B7, C7, D7, E7, F7, G7, H7, I7, \
     = MAP.flatten()
 
 
@@ -43,14 +46,19 @@ class Config:
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
-    MAP_HAS_AMBUSH = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = True
     # ===== End of generated config =====
 
 
 class Campaign(CampaignBase):
     MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
 
     def battle_0(self):
+        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+            return True
+
         return self.battle_default()
 
     def battle_4(self):
diff --git a/campaign/war_archives_20190620_en/sp2.py b/campaign/war_archives_20190620_en/sp2.py
index e39c393b2..ac7fb0db0 100644
--- a/campaign/war_archives_20190620_en/sp2.py
+++ b/campaign/war_archives_20190620_en/sp2.py
@@ -6,16 +6,16 @@ from .sp1 import Config as ConfigBase
 
 MAP = CampaignMap('SP2')
 MAP.shape = 'I7'
-MAP.camera_data = ['D3', 'D4', 'F3', 'F4']
-MAP.camera_data_spawn_point = ['D4', 'F4']
+MAP.camera_data = ['D2', 'D5', 'F2', 'F5']
+MAP.camera_data_spawn_point = ['F5', 'D5']
 MAP.map_data = """
-    ME ME MB -- -- -- ME ME MB
-    ME -- -- ME MB ME -- -- ME
-    ++ -- MB ++ ++ ++ -- ME MB
-    ME ME ME ME MB ME ME ME ++
-    Me ++ ME ME ME ME ME -- Me
-    ME -- Me ++ MB ++ Me ++ ME
-    -- ME -- SP ++ SP -- ME --
+    -- ME -- -- -- -- -- ME --
+    ME -- -- ME ME ME -- -- ME
+    ++ -- MB ++ ++ ++ MB -- ME
+    ME -- -- ME MB ME -- -- ++
+    -- ++ -- -- -- -- -- -- --
+    Me -- -- ++ MB ++ -- ++ Me
+    -- Me -- SP ++ SP -- Me --
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50 50
@@ -47,14 +47,19 @@ class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
-    MAP_HAS_AMBUSH = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = True
     # ===== End of generated config =====
 
 
 class Campaign(CampaignBase):
     MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
 
     def battle_0(self):
+        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+            return True
+
         return self.battle_default()
 
     def battle_4(self):
diff --git a/campaign/war_archives_20190620_en/sp3.py b/campaign/war_archives_20190620_en/sp3.py
index 93a492cfc..9744d5175 100644
--- a/campaign/war_archives_20190620_en/sp3.py
+++ b/campaign/war_archives_20190620_en/sp3.py
@@ -7,15 +7,15 @@ from .sp1 import Config as ConfigBase
 MAP = CampaignMap('SP3')
 MAP.shape = 'I7'
 MAP.camera_data = ['D2', 'D5', 'F2', 'F5']
-MAP.camera_data_spawn_point = ['F5', 'D5']
+MAP.camera_data_spawn_point = ['F5']
 MAP.map_data = """
-    MB -- ME ++ ++ -- -- ++ MB
-    -- ++ ME -- ME -- Me ME --
-    ME ME ME -- ++ ME -- ME MB
-    ME ME -- ++ ME -- -- ++ ++
-    ++ -- ME -- ME ME -- ++ ++
-    ME ME -- ME ++ ++ ME -- SP
-    MB ME ++ ME -- ME -- -- SP
+    -- -- ME ++ ++ ME ME ++ MB
+    -- ++ ME -- ME -- -- ME --
+    -- ME -- -- ++ Me -- -- MB
+    ME -- -- ++ Me -- -- ++ ++
+    ++ -- ME -- -- -- -- ++ ++
+    ME -- -- -- ++ ++ -- -- SP
+    -- ME ++ Me -- Me -- -- SP
 """
 MAP.weight_data = """
     50 50 50 50 50 50 50 50 50
@@ -48,14 +48,19 @@ class Config(ConfigBase):
     # ===== Start of generated config =====
     MAP_HAS_MAP_STORY = False
     MAP_HAS_FLEET_STEP = False
-    MAP_HAS_AMBUSH = True
+    MAP_HAS_AMBUSH = False
+    MAP_HAS_MYSTERY = True
     # ===== End of generated config =====
 
 
 class Campaign(CampaignBase):
     MAP = MAP
+    ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C'
 
     def battle_0(self):
+        if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0):
+            return True
+
         return self.battle_default()
 
     def battle_5(self):