Filters can Or and And conditionals

Add conditionals to view