Updated queries for validation rules and preconditions