Refactored service list filter