diff --git a/sql/base.sql b/sql/base.sql
index 75f321b..4ec5e6c 100644
--- a/sql/base.sql
+++ b/sql/base.sql
@@ -689,6 +689,13 @@ INSERT OR IGNORE INTO ModifierArguments (ModifierId , Name , Value)
 	VALUES ('SCYTHIA_FAITH_PURCHASE_RCAVALRY_CPLMOD' , 'Tag' , 'CLASS_RANGED_CAVALRY'); 
 
 
+-- 08/08/2022: fix bug where bonus is not working on gdr
+DELETE FROM TypeTags WHERE Type='ABILITY_TOMYRIS_BONUS_VS_WOUNDED_UNITS';
+
+INSERT OR IGNORE INTO TypeTags (Type , Tag) VALUES
+	('ABILITY_TOMYRIS_BONUS_VS_WOUNDED_UNITS' ,'CLASS_ALL_COMBAT_UNITS');
+
+
 --==================
 -- Spain
 --==================
diff --git a/sql/dlc_aztec.sql b/sql/dlc_aztec.sql
index 500e88a..d9b25dd 100644
--- a/sql/dlc_aztec.sql
+++ b/sql/dlc_aztec.sql
@@ -34,4 +34,11 @@ INSERT OR IGNORE INTO ModifierArguments (ModifierId, Name, Value)
 	VALUES
 	('HUEY_LAKE_CULTURE', 'ModifierId', 'HUEY_LAKE_CULTURE_MODIFIER'),
 	('HUEY_LAKE_CULTURE_MODIFIER', 'Amount', '2'),
-	('HUEY_LAKE_CULTURE_MODIFIER', 'YieldType', 'YIELD_CULTURE');
\ No newline at end of file
+	('HUEY_LAKE_CULTURE_MODIFIER', 'YieldType', 'YIELD_CULTURE');
+
+
+-- 08/08/2022: fix bug where bonus is not working on gdr
+DELETE FROM TypeTags WHERE Type='ABILITY_MONTEZUMA_COMBAT_BONUS_PER_LUXURY';
+
+INSERT OR IGNORE INTO TypeTags (Type , Tag) VALUES
+	('ABILITY_MONTEZUMA_COMBAT_BONUS_PER_LUXURY' ,'CLASS_ALL_COMBAT_UNITS');
\ No newline at end of file
diff --git a/sql/new_bbg_mapuche.sql b/sql/new_bbg_mapuche.sql
index e271448..3d39a56 100644
--- a/sql/new_bbg_mapuche.sql
+++ b/sql/new_bbg_mapuche.sql
@@ -69,20 +69,7 @@ INSERT OR IGNORE INTO Types
 INSERT OR IGNORE INTO TypeTags
 	(Type , Tag)
 	VALUES
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_RECON'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_MELEE'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_RANGED'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_SIEGE'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_HEAVY_CAVALRY'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_RANGED_CAVALRY'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_LIGHT_CAVALRY'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_ANTI_CAVALRY'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_HEAVY_CHARIOT'),	
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_LIGHT_CHARIOT'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_NAVAL_MELEE'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_NAVAL_RANGED'),
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_NAVAL_RAIDER'),		
-	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_AIRCRAFT');	
+	('ABILITY_TRAIT_MAPUCHE' ,'CLASS_ALL_COMBAT_UNITS');
 
 INSERT OR IGNORE INTO UnitAbilities
 	(UnitAbilityType , Name, Description, Inactive)
diff --git a/sql/nfp_byzantium_gaul.sql b/sql/nfp_byzantium_gaul.sql
index 9e6da57..1a24fa0 100644
--- a/sql/nfp_byzantium_gaul.sql
+++ b/sql/nfp_byzantium_gaul.sql
@@ -13,7 +13,13 @@ DELETE FROM Modifiers WHERE ModifierId='BYZANTIUM_PRESSURE_KILLS';
 UPDATE ModifierArguments SET Value=2 WHERE ModifierId='TAGMA_COMBAT_STRENGTH' AND Name='Amount';
 UPDATE ModifierArguments SET Value=2 WHERE ModifierId='TAGMA_RELIGIOUS_COMBAT' AND Name='Amount';
 
+-- 08/08/2022: fix bug where bonus is not working on gdr
+DELETE FROM TypeTags WHERE Type='ABILITY_BYZANTIUM_COMBAT_UNITSABILITY_BYZANTIUM_COMBAT_UNITS';
 
+INSERT OR IGNORE INTO TypeTags (Type , Tag) VALUES
+	('ABILITY_BYZANTIUM_COMBAT_UNITS' ,'CLASS_ALL_COMBAT_UNITS');
+
+	
 --==================
 -- Gaul
 --==================