Checkbox refactor and RadioFilter addition.