Implemented query-builder changes.