Can now toggle criteria types on/off