Family & Friends - Beneficiary Role

Beneficiaries don't appear in the order that they are selected on insurance assignments on the payments & adjustments page. Instead they are in order of how they are listed on the F&F page. I'm wondering if it's best to add a role for beneficiary or change where the beneficiary information is pulling from because as it stands it's coming from the F&F page yet there is no role so it stands to reason that it would be best if the information is actually coming from the Payments & Adjustments Page. However, the address isn't given on the Payments & Adjustments page but it is on the F&F so this makes me wonder if there should be a beneficiary role since they will be chosen from that page anyway but when they populate on forms it should be in order of how they are listed on the P&A page.