Are you suggesting we leave out filtering by ids and move the filtering by type and organization into ES?