Some minor changes in the query builder.