added select fields for vat & tax, update fee/total acc. to these