diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
index 45566d1d8f0a..746833e5092a 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
@@ -2,12 +2,12 @@
 <div class="form-editor">
     <div class="t3-form-control-group form-group">
         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
-            <span data-template-property="label" />
+            <span data-template-property="label"></span>
             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
             </div>
         </label>
-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
index 579e647815ed..799be42c6e63 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="t3-form-validator-editor">
     <h4 data-template-property="header-label">
-        <span data-template-property="label" />
+        <span data-template-property="label"></span>
     </h4>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
index 5584791242fb..c375a6efd242 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
@@ -2,10 +2,10 @@
 <div class="form-editor">
     <div class="t3-form-control-group form-group">
         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
-            <span data-template-property="label" />
+            <span data-template-property="label"></span>
         </label>
         <div id="t3-form-add-finisher" class="t3-form-add-collection-element">
-            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
+            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control"></select>
         </div>
     </div>
 </div>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
index 13e34e1308c6..10d35f626881 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
@@ -1,17 +1,17 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="form-editor">
     <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label><br>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label><br>
         <div class="t3-form-controls btn-group" data-identifier="inspectorEditorControlsWrapper">
             <button type="button" class="btn btn-default" data-identifier="viewportButton"></button>
         </div>
     </div>
     <div class="t3-form-control-group form-group" data-template-property="numbersOfColumnsToUse">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="numbersOfColumnsToUse-label" /></label>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="numbersOfColumnsToUse-label"></span></label>
         <div class="t3-form-controls" data-identifier="numbersOfColumnsToUse-inspectorEditorControlsWrapper">
             <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="number" value="" data-template-property="numbersOfColumnsToUse-propertyPath" class="form-control">
         </div>
-        <span data-template-property="numbersOfColumnsToUse-fieldExplanationText" />
+        <span data-template-property="numbersOfColumnsToUse-fieldExplanationText"></span>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html
index 972e21065d61..4f43b86e0f42 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html
@@ -5,7 +5,7 @@
 <f:if condition="{formvh:be.maximumFileSize()} > 0">
     <div class="t3-form-validator-editor">
         <div data-template-property="header-label" class="t3-form-control-group">
-            <span data-template-property="label" data-maximumFileSize="{formvh:be.maximumFileSize()}" class="inspector-editor-hint" />
+            <span data-template-property="label" data-maximumFileSize="{formvh:be.maximumFileSize()}" class="inspector-editor-hint"></span>
         </div>
     </div>
 </f:if>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
index 6f00359206ca..031ffc6b33fe 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
@@ -1,8 +1,8 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="t3-form-control-group form-group">
-    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
     <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
-        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" multiple="multiple" />
+        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" multiple="multiple"></select>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
index 355a9e10eb0c..ee99f7e1aad5 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="form-editor">
     <div class="t3-form-control-group form-group property-grid">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
         <div data-editor="new-property-grid" data-template-property="newPropertyPath">
             <table class="table table-hover" data-identifier="propertyGridContainer">
                 <thead>
@@ -39,9 +39,9 @@
                 </tbody>
             </table>
         </div>
-        <div data-editor="property-grid" data-template-property="propertyPath" class="t3-form-grid" />
-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
-        <span data-template-property="validationErrors" />
+        <div data-editor="property-grid" data-template-property="propertyPath" class="t3-form-grid"></div>
+        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
+        <span data-template-property="validationErrors"></span>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
index 31a2d16d0895..aca4e010f464 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
@@ -2,18 +2,18 @@
 <div class="form-editor">
     <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
-            <span data-template-property="label" />
+            <span data-template-property="label"></span>
             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
             </div>
         </label>
     </div>
     <div class="t3-form-control-group form-group" data-template-property="validationErrorMessage">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="2"><span data-template-property="validationErrorMessage-label" /></label>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="2"><span data-template-property="validationErrorMessage-label"></span></label>
         <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
             <input data-random-id data-random-id-attribute="id" data-random-id-number="2" type="text" value="" data-template-property="validationErrorMessage-propertyPath" class="form-control">
         </div>
-        <span data-template-property="validationErrorMessage-fieldExplanationText" class="inspector-editor-hint" />
+        <span data-template-property="validationErrorMessage-fieldExplanationText" class="inspector-editor-hint"></span>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
index 78bfc16f4f97..b4fcb59d8127 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
@@ -1,8 +1,8 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="t3-form-control-group form-group">
-    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
     <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
-        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
+        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control"></select>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
index 791bdbaa8ff7..c1288ee9cff7 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
@@ -1,7 +1,7 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="form-editor">
     <div class="t3-form-control-group form-group">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
         <div class="input-group" data-identifier="inspectorEditorControlsGroup">
             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
@@ -17,8 +17,8 @@
                 </span>
             </span>
         </div>
-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
-        <span data-template-property="validationErrors" />
+        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
+        <span data-template-property="validationErrors"></span>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
index 070c38e854c4..1ea6c5444d2a 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
@@ -1,11 +1,11 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="form-editor">
     <div class="t3-form-control-group form-group">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
         <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
-            <textarea data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="propertyPath" class="form-control" />
+            <textarea data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="propertyPath" class="form-control"></textarea>
         </div>
-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
index e2deef3c0067..5f74057743fd 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
@@ -1,18 +1,18 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="form-editor">
     <div class="t3-form-control-group form-group">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
         <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
             <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control" data-insert-target="">
             <div class="help-block">
                 <a href="#" data-template-property="onclick" class="btn btn-default">
                     <span class="t3js-icon icon icon-size-small icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">
-                        <span class="icon-markup" data-template-property="image" />
-                    </span> <span data-template-property="buttonLabel" />
+                        <span class="icon-markup" data-template-property="image"></span>
+                    </span> <span data-template-property="buttonLabel"></span>
                 </a>
             </div>
-            <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
-            <span data-template-property="validationErrors" />
+            <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
+            <span data-template-property="validationErrors"></span>
         </div>
     </div>
 </div>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
index 92af367a41be..170d3187aba5 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
@@ -1,13 +1,13 @@
 <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
 <div class="form-editor">
     <div class="t3-form-control-group form-group">
-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
+        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
         <div data-identifier="inspectorEditorControlsGroup">
             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
             </div>
         </div>
-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
     </div>
 </div>
 </html>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
index 67c20125d64d..606bd3c9bf58 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
@@ -2,10 +2,10 @@
 <div class="form-editor">
     <div class="t3-form-control-group form-group">
         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
-            <span data-template-property="label" />
+            <span data-template-property="label"></span>
         </label>
         <div id="t3-form-add-validator" class="t3-form-add-collection-element" data-template-property="selectOptionsContainer">
-            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
+            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control"></select>
         </div>
     </div>
 </div>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
index 188e8f39c0e5..0452a0085874 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
@@ -14,7 +14,7 @@
             </div>
         </div>
         <div class="element-content">
-            <div data-template-property="properties.contentElementUid" />
+            <div data-template-property="properties.contentElementUid"></div>
         </div>
     </div>
     <div class="t3-form-validator-info" data-identifier="validators">
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
index 36064f4177bb..0936a780d19d 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
@@ -14,9 +14,9 @@
             </div>
         </div>
         <div class="element-content">
-            <div data-template-property="properties.saveToFileMount" />
+            <div data-template-property="properties.saveToFileMount"></div>
             <div data-identifier="multiValueContainer" data-template-property="properties.allowedMimeTypes">
-                <div data-template-property="_value" />
+                <div data-template-property="_value"></div>
             </div>
         </div>
     </div>
diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
index 0294a305d905..28cbda361946 100644
--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
+++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
@@ -14,7 +14,7 @@
             </div>
         </div>
         <div class="element-content">
-            <div data-template-property="properties.text" />
+            <div data-template-property="properties.text"></div>
         </div>
     </div>
     <div class="t3-form-validator-info" data-identifier="validators">
