Additional fixes in tax display/reporting