moving logic to filter, fixed filter checkboxes
filter options much better