Fixes but related to removing filters.
Merge pull request #1792 from mbebenita/filter

Fixes but related to removing filters.