Review fix: use chunking for performance