On quotes / invoices: sub-total, tax, (taxed) shipping - order is confusing

On quotes and invoices: It is counter-intuitive and confusing that when shipping is taxed, it still appears in the line after tax. Currently it is: subtotal, tax, shipping. If shipping is taxed (or in any case) tax should be shown at the end. Thank you!