QueryBuilder now uses recently introduced Filter class