Updated QueryBuilder and small style fix in queries.