Updated query-builder.