diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst
index fc6fb1a4b568da4ff73189533725081e41ee7516..b180820350a839374218e2ffcf098c48486678f8 100644
--- a/extension/Documentation/Manual.rst
+++ b/extension/Documentation/Manual.rst
@@ -3812,7 +3812,11 @@ Changes
 
  * Play formEditor.sql.
 
-   * Dropdownlist of container assigment: remove 'class' (always 'container') and insert 'type' ('pill', 'fiedlset', 'templategroup').
+   * Dropdownlist of container assignment:
+
+     * Display 'type' ('pill', 'fieldset', 'templategroup') instead of 'class' (always 'container').
+     * Display 'name' (internal name) instead of 'label' (shown on the website and might not so usefull as 'name' which is nowhere else used than in that dropdown.
+
    * FormElement.placeholder colum width extended to 512:
 
      ALTER TABLE `FormElement` CHANGE `placeholder` `placeholder` VARCHAR(512) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';
diff --git a/extension/qfq/sql/formEditor.sql b/extension/qfq/sql/formEditor.sql
index 3269b01c30a02629d5fa79149c0019472b169491..dfd383b6cf8c589dfce227fbb6e1ace9e04c2ac6 100644
--- a/extension/qfq/sql/formEditor.sql
+++ b/extension/qfq/sql/formEditor.sql
@@ -212,7 +212,7 @@ VALUES
    ''),
   (2, 'formId', 'formId', 'readonly', 'text', 'all', 'native', 110, 0, 255, '', '', '', '', '', 100, '', 'no', '', '', '', '', ''),
   (2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120, 0, 0, '', '', '',
-   '{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.label) FROM FormElement As fe WHERE fe.formId={{formId:S0}} AND fe.class="container" ORDER BY fe.type, fe.name }}',
+   '{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.name) FROM FormElement As fe WHERE fe.formId={{formId:S0}} AND fe.class="container" ORDER BY fe.type, fe.name }}',
    'emptyItemAtStart', 100, '', 'no', '', '', '', '', ''),
   (2, 'enabled', 'Enabled', 'show', 'checkbox', 'all', 'native', 130, 0, 0, '', '', '', '', '', 100, '', 'no', '', '', '', '', ''),
   (2, 'dynamicUpdate', 'Dynamic Update', 'show', 'checkbox', 'all', 'native', 135, 0, 0, 'On change, this element will be updated and trigger other.',