add orderBy and filter