Please create separate tax receipt template fields for the Donation Advisor profile that mirror the currently available fields for the Donor profile (salutation, legal name, org contact label, work title, organization, recognition name, etc.). While it's helpful that the address fields beginning in "addr." will change depending on if there is a Donation Advisor applied to a particular donation, we still have to make manual updates on every tax receipt letter to correct salutations, etc. when we have a Donation Advisor applied to the donation. Creating two separate sets of fields would reduce both the staff time spent making these corrections and the chance that an error would inadvertently make it to a final letter sent to a donor. A simple IF conditional on users' tax receipt templates would ensure that the Donation Advisor profile information is merged when it exists and that the Donor profile information is merged when a Donation Advisor does not exist.