v2.1.6 Bugfix for Exclude filter