Refactored filter checkboxes