Fix nested Archetype validation
Changes