renamed ModelQuery to QueryBuilder