Update following API changes + order by views, not with the collection