Nested items fixes