Use a QueryBuilder for matches
Update dependencies