Extension of Fix for FS#1826 - Add new task - incorrect rendering... as edit task had same issues.