I will take a better look at this since I don't think I understand the way this part works well enough.
But I wonder if it is something that can be changed in a second step.