Remove validated / not validated filters
(cherry picked from commit 88b23e8a983c7bff377c3af2109a2a0f8930fada)