Fix issue when resolving addresses and there were multiple movements with the same address

[bchamagne]

Description

Fix a edge case on movements
Fixes #1334

Type of change

• Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Unit tested

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• I have added tests that prove my fix is effective or that my feature works
• New and existing unit tests pass locally with my changes
• Any dependent changes have been merged and published in downstream modules