Fix filters update issues
When removing filter content the filter label is also removed.
related to issue #2000
Merge pull request #2025 from jjettenn/master

Fix filters update issues