fixed claimant different address functionality