CARE #133: Fixed forms joins in sample xml queries