Review payor address mapping

We found a new situation on case 1508187070. The insured and payor are the same person. They listed a different billing address then their home address. FAST mapped the home address for the payor instead of the addressed listed as the billing address. Will need to review these scenarios and which address should map where. We are thinking it should feed to FAST with the address listed in the payor section as the mailing address for both PI and payor (and owner in this case since same person is PI, payor, and owner); and the physical address listed in the PI’s section should feed to FAST as the home address for all 3 roles as well.