How to populate Box E, F1, F2, F3 correctly on 1120-S K-1 Part II for disregarded entity without the disregarded entity showing on the state return as shareholder?

[Donna G]

The 2024 1120-S K-1 requires additional information from the prior year K-1.  It is requesting the disregarded entity (shareholder of record) be shown in F1 and the reporting entity in F2 of Part II.  Box E and F1 are populating from Screen 5 - shareholder information.  The reporting entity is coming from Screen 36 where I have entered information regarding the shareholder that is disregarded so that schedule B question 3 and B-1 are reported correctly.  The partner name and information I have used in prior years in screen 5 was that of the reporting entity, not the disregarded entity.  This year the only way to get the F1 box to show the disregarded entity is to change the partner in screen 5 to the disregarded entity.  However, that causes the state returns to populate with the disregarded entity information only, which I don't want because it is not being reported there.  The disregarded entity is a grantor trust  (IDGT) if that matters.  Has anyone found a workaround for this?  Or am I just looking at things wrong?