diff --git a/extension/Documentation/Release.rst b/extension/Documentation/Release.rst
index e3d4b69a3466875f015f24756a49210a46a3622c..b7ebd138f73cc33596290e69b2a6e1af188cbb22 100644
--- a/extension/Documentation/Release.rst
+++ b/extension/Documentation/Release.rst
@@ -46,7 +46,7 @@ Notes
 
 * Align FormElement labels left/center/right.
 * Cleanup FormEditor.
-* All SQL commands allowed now.
+* All SQL commands now are allowed.
 
 Features
 ^^^^^^^^
@@ -63,7 +63,7 @@ Bug Fixes
 
 * #7671 / On FormElements, 'fillStoreVar' is now detected and fired at first.
 * Fix for checkbox-inline / radio-inline.
-* Check for non unique FormElements now allows multiple empty FormElements.
+* Check for non unique FormElements: multiple empty FE.name (e.g. for FE.type=subrecord) are allowed now.
 
 
 Version 19.1.1
@@ -145,7 +145,7 @@ Notes
 ^^^^^
 
 * Existing installations: update QFQ extension config form-layout.formBsColumns/formBsLabelColumns/formBsInputColumns,formBsNoteColumns.
-  old: 12, new: 'col-md-12 col-lg10' resp. smaller values for individual columns.
+  old: '12', new: 'col-md-12 col-lg10' resp. smaller values for individual columns.
 * New config values:
 
   * Config/flagProduction: yes/now - differentiate between development und production system. Will be used for
@@ -171,7 +171,7 @@ Features
 * #7228 / Show error if form element with same name and class already exists.
 * #7494 / Exception 'General Error': disable/enable per config.
 * Adapt class paths in composer.json to the newly refactored folder names.
-* Add col-lg-10 to notes section.
+* Add 'col-lg-10' to notes section.
 * Added Alert Manager to have better control over the Alerts.
 * Config.php: make 'reading dbname' Typo3 version dependent.
 * Delete two old composer.json and call new composer in Makefile.
diff --git a/extension/Source/core/AbstractBuildForm.php b/extension/Source/core/AbstractBuildForm.php
index cae23a6dc7167a77ef2c754e09be05ff4b703d6e..b2a44601d15b6be039d03ce262b29c2d2cbfe7fe 100644
--- a/extension/Source/core/AbstractBuildForm.php
+++ b/extension/Source/core/AbstractBuildForm.php
@@ -1064,7 +1064,7 @@ abstract class AbstractBuildForm {
 
         $this->getFeMode($feMode, $dummy, $disabled, $required);
 
-        return [API_FORM_UPDATE_DISABLED => $disabled === 'yes', API_FORM_UPDATE_REQUIRED => $required === 'yes'];
+        return [API_FORM_UPDATE_DISABLED => ($disabled === 'yes'), API_FORM_UPDATE_REQUIRED => ($required === 'yes')];
     }
 
     /**
@@ -2393,9 +2393,8 @@ abstract class AbstractBuildForm {
         $attribute .= Support::doAttribute('name', $htmlFormElementName);
         $attribute .= Support::doAttribute('class', 'form-control');
         $attribute .= Support::doAttribute('title', $formElement[FE_TOOLTIP]);
-        $attribute .= $this->getAttributeList($formElement, ['autofocus']);
+        $attribute .= $this->getAttributeList($formElement, ['autofocus', F_FE_DATA_PATTERN_ERROR, F_FE_DATA_REQUIRED_ERROR]);
         $attribute .= Support::doAttribute('data-load', ($formElement[FE_DYNAMIC_UPDATE] === 'yes') ? 'data-load' : '');
-        $attribute .= $this->getAttributeList($formElement, [F_FE_DATA_PATTERN_ERROR, F_FE_DATA_REQUIRED_ERROR, F_FE_DATA_MATCH_ERROR, F_FE_DATA_ERROR]);
         $attribute .= Support::doAttribute(ATTRIBUTE_DATA_REFERENCE, $formElement[FE_DATA_REFERENCE]);
 
         if (isset($formElement[FE_SIZE]) && $formElement[FE_SIZE] > 1) {
@@ -3086,7 +3085,7 @@ abstract class AbstractBuildForm {
         Support::setIfNotSet($formElement, FE_FILE_BUTTON_TEXT, FE_FILE_BUTTON_TEXT_DEFAULT);
         $htmlInputFile = Support::wrapTag("<label $attributeFileLabel>", $htmlInputFile . $formElement[FE_FILE_BUTTON_TEXT]);
 
-        $disabled= ($formElement[FE_MODE]==FE_MODE_READONLY)?'disabled':'';
+        $disabled = ($formElement[FE_MODE] == FE_MODE_READONLY) ? 'disabled' : '';
 
         $deleteButton = Support::wrapTag("<button type='button' class='btn btn-default delete-file $disabled' $disabled data-sip='$sipUpload' name='delete-$htmlFormElementName'>", $this->symbol[SYMBOL_DELETE]);