You brought to us a problem with the structure of your data, but you haven't told us anything about how you want your data to be structured. I had to guess.

And I indicated as much. When I suggested that change, I specified the condition under which it would help.

Please provide better information.