HHH-8280 - validity audit strategy breaks when entity IDs are reused