Move tax after fees. #2518