Ship Confirmation Tracking Links

We've had a long running issue with the UPS/USPS tracking links in our shipping confirmation emails that we have not found a feasible solution to. When an order contains multiple products with different tracking numbers, only one link appears for customers to view their tracking. When the link is clicked, rather than pulling one tracking number into the URL, all of the tracking numbers are pulled in and inserted into the search query on the UPS/USPS site, which returns an error. Essentially, if someone orders multiple products, they are going to have to manually copy and paste each number into