Fixes to incorrect validation rule queries that were identified during testing