Fixing issue with infinite scroll batching