ESSENTIALS-330: Fix issues with chosen select-box.
ESSENTIALS-327: A few archetype adjustments to avoid non-functional diffs when Essentials or Auto-Export touch these files.