replaced address components with address 1 and 2
corrected mailing address lookup
wrapping free text tag into mailingaddress