Changes in the query builder style and some improves in the query builder behaviour.