Issue #1678076 by UrmasZ: updated tax calculation to use the stored amount for the tax component instead of calculating it manually
