Add additional ElementExcludeFilter items

Fixes gh-2088
Polish