diff --git a/CleanSlate/decisions/HF_baptism_decisions.txt b/CleanSlate/decisions/HF_baptism_decisions.txt
index 301ade9ca..ef99bbc04 100644
--- a/CleanSlate/decisions/HF_baptism_decisions.txt
+++ b/CleanSlate/decisions/HF_baptism_decisions.txt
@@ -692,19 +692,16 @@ targeted_decisions = {
 									block_general_event_trigger = no
 								}
 
-								any_realm_character = {
+								any_realm_lord = {
 									is_theocracy = yes
-									religion = FROM
+									religion = ROOT_FROM
 									controls_religion = no
 									block_general_event_trigger = no
 
-									trigger_if = {
-										limit = { lower_real_tier_than = COUNT }
-
-										OR = {
-											is_cardinal = yes
-											is_antipope = yes
-										}
+									OR = {
+										higher_real_tier_than = BARON
+										is_cardinal = yes
+										is_antipope = yes
 									}
 								}
 							}
diff --git a/CleanSlate/events/HF_baptism_events.txt b/CleanSlate/events/HF_baptism_events.txt
index 12bcbaa33..26e41b2c2 100644
--- a/CleanSlate/events/HF_baptism_events.txt
+++ b/CleanSlate/events/HF_baptism_events.txt
@@ -513,9 +513,10 @@ narrative_event = {
 				event_target:sponsoring_king = {
 					religion_group = christian
 
-					any_courtier_or_vassal = {
+					any_realm_lord = {
 						is_theocracy = yes
 						religion = event_target:sponsoring_king
+						controls_religion = no
 						block_general_event_trigger = no
 
 						OR = {
@@ -528,10 +529,11 @@ narrative_event = {
 			}
 
 			event_target:sponsoring_king = {
-				random_courtier_or_vassal = {
+				random_realm_lord = {
 					limit = {
 						is_theocracy = yes
 						religion = event_target:sponsoring_king
+						controls_religion = no
 						block_general_event_trigger = no
 
 						OR = {
@@ -543,11 +545,11 @@ narrative_event = {
 
 					save_event_target_as = scoped_baptizer
 				}
+			}
 
-				save_persistent_event_target = {
-					name = baptizing_bishop_per
-					scope = event_target:scoped_baptizer
-				}
+			save_persistent_event_target = {
+				name = baptizing_bishop_per
+				scope = event_target:scoped_baptizer
 			}
 
 			custom_tooltip = {
@@ -2236,9 +2238,10 @@ narrative_event = {
 				event_target:sponsoring_king = {
 					religion_group = christian
 
-					any_courtier_or_vassal = {
+					any_realm_lord = {
 						is_theocracy = yes
 						religion = event_target:sponsoring_king
+						controls_religion = no
 						block_general_event_trigger = no
 
 						OR = {
@@ -2254,10 +2257,11 @@ narrative_event = {
 				text = tooltip_gain_baptized_by_bishop
 
 				event_target:sponsoring_king = {
-					random_courtier_or_vassal = {
+					random_realm_lord = {
 						limit = {
 							is_theocracy = yes
 							religion = event_target:sponsoring_king
+							controls_religion = no
 							block_general_event_trigger = no
 
 							OR = {
@@ -8460,7 +8464,7 @@ character_event = {
 			}
 		}
 
-		random_realm_character = {
+		random_realm_lord = {
 			limit = {
 				is_theocracy = yes
 				religion = ROOT
@@ -9963,7 +9967,7 @@ character_event = {
 			}
 		}
 
-		random_realm_character = {
+		random_realm_lord = {
 			limit = {
 				is_theocracy = yes
 				religion = ROOT
@@ -9972,8 +9976,8 @@ character_event = {
 
 				OR = {
 					higher_real_tier_than = BARON
-					is_antipope = yes
 					is_cardinal = yes
+					is_antipope = yes
 				}
 			}