Added fixes for the tax field