Fixed most of the Checkbox filter issue, But it's still behaving as AND instead of OR