IDEA-115897: clean filter right after pressing cross button
(cherry picked from commit 8f7e695)
remove duplicated check
(cherry picked from commit 60bd375)