Properly add shipping tax to tax totals