Use query's pagination to avoid loading large result set of Item
Changed batch size of Item indexing
Resolved merge conflict