v2.1.7 Bugfix for Exclude filter