Refactor using FilterComponent.