add checkbox list support on criteria