Fix filters update issues

When removing filter content the filter label is also removed.
related to issue #2000