Thanks all for your comments, especially @matthiasthehun76 for the supportive comments - I hadn't realised content type changed so drastically. After reading some of your responses, I went away and did some homework on the 60+ content changes, and it does seem it was geared towards enforcing grouping and whilst I realise…
@kvet Sorry for taking so long to get back, had a bad few pain days - thank you so much - that is indeed absolutely perfect, thank you so much for taking the time to do that.