This should fix design choices when generating a structure via the Administration menu.
However, I didn't test locally.

:)