diff --git a/data/schema/units/modifications.cfg b/data/schema/units/modifications.cfg
index a057d5ca26b0..19e600d33a98 100644
--- a/data/schema/units/modifications.cfg
+++ b/data/schema/units/modifications.cfg
@@ -14,9 +14,13 @@
 				value=new_attack
 				super="units/unit_type~core/attack"
 			[/case]
-			{FILTER_TAG "case" weapon value=remove_attacks}
-			{FILTER_TAG "case" weapon (
+			[case]
+				value=remove_attacks
+				super="$filter_weapon"
+			[/case]
+			[case]
 				value=attack
+				super="$filter_weapon"
 				{SIMPLE_KEY set_name string}
 				{SIMPLE_KEY set_description t_string}
 				{SIMPLE_KEY set_type string}
@@ -44,7 +48,7 @@
 					super="units/unit_type/attack/specials"
 					{DEFAULT_KEY mode effect_set_special_mode replace}
 				[/tag]
-			)}
+			[/case]
 			[case]
 				value=max_attacks,max_experience
 				{SIMPLE_KEY increase int_percent}