Fast Filtering: Match in one go (#2167)