fix tax calculation based on ship address, from #17051