Add tax related components to return items. Fixes #4964