[arctic-bear] - Refactor generic filter.