Adding datastore cohort search optimizations