Updated map with xsl:apply-templates for both ShippedTo and BilledTo.