fix for allowing user populated criteria to override operation generated criteria