Simplify batch query