Filter with AND/OR chain capability
Merge branch 'feature-filter-andor'