Fix for extra children being returned.
Merge branch 'parent-item-visibility'