Fix for Existing Policy mapping in Proposal Form