Checkbox, Radio filtering added