Refactored filter matching into domain logic project.