Add partial refactor of filters.