Refactor service filter.