Matching and filtering code changed; buggy version.