fix merchant fields for tax