We gave up on this in 2020. We moved on to H&R Block tax software which handles this issue correctly. Second year using it and we are completely satisfied.
