Assistance now persists when switching templates.