Enum completion fixes
New .switch template