Bulkloader support fix getting more entities than the specified batch size