The Matching class now constructs its filter properly