Issue 18833: Changes to text and parameter widget