Changes in the query builder for the treatment of the scopes. By now, we make it manually.