Refactoring ColumnFilter plugin