Menu discrepancy between Instances and InDesign

I am currently producing a family in three variations in Glyphs: Display, Headline and Text.

They are all in the correct order in the Instances menu for the uprights and the separate Italic file from Thin to Bold in Glyphs.

But when exported as OTF’s the order appears to be semi-random when viewed in the InDesign menu. Would it be better to separate the three styles in Glyphs and then export? Which would create six separate families: Display, Display Italic, Headline, Headline Italic, Text and Text Italic.

Would that create a more orderly menu which would all appear under the family name?

Have you read this: https://glyphsapp.com/tutorials/naming