Change find operations so they batch by resource