Additional charges copied from Order to multiple invoices when already invoiced

Would be good to have an option to allow or not the system to copy across the additional charges to second and following invoices.

We have lots of orders that are fulfilled in multiple shipments, but we only charge shipping once. The freight is imported from our eCommerce as Additional charge. We charge freight depending on the value of the order and the customer and also have other additional fees.

Because the are imported into the order the system will duplicate the additional fee multiple times as we invoice customer for part shipments and most of the time staff forgets to delete them from the second and following times. Is there a way to include the features to add the additional fees once? Like the way items work, the system can populate only what is pending to invoice, items from the main screen and the additional screen in the same way.