feat(query-builder): support for nested queries and other improvements

feat(query-builder): support for nested queries and other improvements #26940