diff --git a/customfield/field/number/classes/field_controller.php b/customfield/field/number/classes/field_controller.php
index d10a9b83d2e..dd9c5899edb 100644
--- a/customfield/field/number/classes/field_controller.php
+++ b/customfield/field/number/classes/field_controller.php
@@ -76,7 +76,7 @@ class field_controller  extends \core_customfield\field_controller {
         $mform->setType('configdata[decimalplaces]', PARAM_INT);
 
         // Display format settings.
-        // TODO: Change this after MDL-82996 fixed.
+        // TODO: Change this after MDL-85825 fixed.
         $randelname = 'str_display_format';
         $mform->addGroup([], $randelname, html_writer::tag('h4', get_string('headerdisplaysettings', 'customfield_number')));
 
diff --git a/lib/formslib.php b/lib/formslib.php
index 68716fb07b3..895f76c1c03 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -3187,7 +3187,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
     var $_openHiddenFieldsetTemplate = "\n\t<fieldset class=\"hidden\"><div>";
 
     /** @var string Template used when opening a fieldset */
-    var $_openFieldsetTemplate = "\n\t<fieldset class=\"{classes}\" {id}>";
+    var $_openFieldsetTemplate = "\n\t<fieldset class=\"{classes}\" {id} {name}>";
 
     /** @var string Template used when closing a fieldset */
     var $_closeFieldsetTemplate = "\n\t\t</div></fieldset>";
@@ -3571,7 +3571,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
 
         // Define collapsible classes for fieldsets.
         $arialive = '';
-        $fieldsetclasses = array('clearfix');
+        $fieldsetclasses = ['clearfix', 'fitem'];
         if (isset($this->_collapsibleElements[$header->getName()])) {
             $fieldsetclasses[] = 'collapsible';
             if ($this->_collapsibleElements[$header->getName()]) {
@@ -3589,6 +3589,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{
         }
 
         $openFieldsetTemplate = str_replace('{id}', $id, $this->_openFieldsetTemplate);
+        $openFieldsetTemplate = str_replace('{name}', ' name="' . $name . '"', $openFieldsetTemplate);
         $openFieldsetTemplate = str_replace('{classes}', join(' ', $fieldsetclasses), $openFieldsetTemplate);
 
         $this->_html .= $openFieldsetTemplate . $headerhtml;