CORE-4663: Contextual help correction