VID-1801 Fix batch size in query