Greatly improve the way the intelligent guessing of criteria works.