UI-2198 : improve struct html