Process messages in batches instead of one at a time (hopefully we'll start clearing the queue more quickly)
Update version of query in use