diff --git a/UI/Component/AdvancedInput.js b/UI/Component/AdvancedInput.js
index 065b624..6f0aead 100644
--- a/UI/Component/AdvancedInput.js
+++ b/UI/Component/AdvancedInput.js
@@ -304,6 +304,11 @@ export class AdvancedInput
             let value       = '';
 
             for (let j = 0; j < fieldLength; ++j) {
+                fields[j].setAttribute(
+                    'data-value',
+                    jsOMS.getArray(fields[j].getAttribute('data-tpl-value'), data)
+                );
+
                 value = jsOMS.getArray(fields[j].getAttribute('data-tpl-value'), data);
                 uuid += value;
             }
diff --git a/UI/Component/Form.js b/UI/Component/Form.js
index 8881554..7328281 100644
--- a/UI/Component/Form.js
+++ b/UI/Component/Form.js
@@ -19,7 +19,7 @@ import { FormView } from '../../Views/FormView.js';
  * data-ui-content = what is the main parent
  * data-ui-element = what are the elements to replace
  *
- * @tood Orange-Management/jsOMS#60
+ * @todo Orange-Management/jsOMS#60
  *  On change listener
  *  Allow to add a on change listener in a form. This should result in automatic submits after changing a form.
  *  Consider the following cases to submit the form: