Fixed a bug with empty or filters
Merge remote-tracking branch 'origin/group-filter-fix' into emwf-refactor