Change optional elements markup to match nestedelements js