How are people handling the movement member for plug accounts

Summary:

As far as I can tell, when intercompany accounts eliminate to the plug account the data stays in the original movement member.

This means that when 2 accounts eliminate to a plug account but have different movement members, you see this data on the cash flow and it doesn't eliminate unless the movements happen to be under the same movement parent.

Firstly, is my understanding correct?

Secondly, if so, how have others got around this issue?

Thanks