Batch scope query fix attempt.