fix: correct spans linking in batches case

[draincoder]

Description

Correct spans linking in batches case.

Type of change

• Bug fix (a non-breaking change that resolves an issue)
• New feature (a non-breaking change that adds functionality)

Checklist

• My code adheres to the style guidelines of this project (scripts/lint.sh shows no errors)
• I have conducted a self-review of my own code
• My changes do not generate any new warnings
• I have added tests to validate the effectiveness of my fix or the functionality of my new feature
• Both new and existing unit tests pass successfully on my local environment by running scripts/test-cov.sh
• I have ensured that static analysis tests are passing by running scripts/static-analysis.sh