New model returns different tree / items structure

This properly sifts out if there are child items and prevents a nasty
array to string error in Lex.