Issue #24272:add filters
Merge pull request #1764 from garyhgohoos/24272

Issue #24272:add filters