Remove ineffecient nonfix-fix of executing query into giant list before pagination