Old subtotal problem of multilevel subtotals being in incorrect locations) reappearing in Excel 2016

Hi, 

I am having issues with multi-level subtotals in Excel 2016.  Thought it best to show a couple of screenshots to illustrate the problem:

Raw data without subtotalsOnce a multilevel subtotal is added, the order of the subtotals gets messed upMultilevel subtotal collapsed down

How can I fix this? I tried to see if changing the order of nesting the subtotals would work but that didn't help. Created a very basic data set and that seems to work fine so not sure why it stops working for a bigger dataset.

Any suggestions or is this the old multi-level sub-total error resurfacing? Very frustrating! Appreciate any help.