Dynamic filters on MatchList + Replace MatchController with the good version