New improvements for the query builder.