Batched store optimize range queries

Looks good on CI