From c197beb0d5ffc03adca5f23fe46874f2357b406b Mon Sep 17 00:00:00 2001
From: Torben Hansen <derhansen@gmail.com>
Date: Wed, 5 Jun 2024 07:41:08 +0200
Subject: [PATCH] [TASK] Avoid usage of deprecated array keys in FlexForm

Refs #1236
---
 Configuration/FlexForms/Pieventcalendar.xml   | 142 +++++++--------
 Configuration/FlexForms/Pieventdetail.xml     |  44 ++---
 Configuration/FlexForms/Pieventlist.xml       | 162 +++++++++---------
 .../FlexForms/Pieventregistration.xml         |  44 ++---
 Configuration/FlexForms/Pieventsearch.xml     | 162 +++++++++---------
 Configuration/FlexForms/Piuserreg.xml         |  98 +++++------
 6 files changed, 326 insertions(+), 326 deletions(-)

diff --git a/Configuration/FlexForms/Pieventcalendar.xml b/Configuration/FlexForms/Pieventcalendar.xml
index f810b713f..265fe734e 100644
--- a/Configuration/FlexForms/Pieventcalendar.xml
+++ b/Configuration/FlexForms/Pieventcalendar.xml
@@ -14,25 +14,25 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.all</numIndex>
-                                    <numIndex index="1">all</numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.all</label>
+                                    <value>all</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.future</numIndex>
-                                    <numIndex index="1">future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.future</label>
+                                    <value>future</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</numIndex>
-                                    <numIndex index="1">current_future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</label>
+                                    <value>current_future</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.past</numIndex>
-                                    <numIndex index="1">past</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.past</label>
+                                    <value>past</value>
                                 </numIndex>
                                 <numIndex index="4">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.time_restriction</numIndex>
-                                    <numIndex index="1">time_restriction</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.time_restriction</label>
+                                    <value>time_restriction</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -92,21 +92,21 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</numIndex>
-                                    <numIndex index="1">title</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</label>
+                                    <value>title</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.startdate</numIndex>
-                                    <numIndex index="1">startdate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.startdate</label>
+                                    <value>startdate</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.enddate</numIndex>
-                                    <numIndex index="1">enddate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.enddate</label>
+                                    <value>enddate</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -119,17 +119,17 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</numIndex>
-                                    <numIndex index="1">asc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</label>
+                                    <value>asc</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</numIndex>
-                                    <numIndex index="1">desc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</label>
+                                    <value>desc</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -142,17 +142,17 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.none</numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.none</label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.exceptTopEvents</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.exceptTopEvents</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.onlyTopEvents</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.onlyTopEvents</label>
+                                    <value>2</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -175,25 +175,25 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.ignore</numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.ignore</label>
+                                    <value></value>
                                 </numIndex>
-                                <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.or</numIndex>
-                                    <numIndex index="1">OR</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.or</label>
+                                    <value>OR</value>
                                 </numIndex>
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.and</numIndex>
-                                    <numIndex index="1">AND</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.and</label>
+                                    <value>AND</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notor</numIndex>
-                                    <numIndex index="1">NOTOR</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notor</label>
+                                    <value>NOTOR</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notand</numIndex>
-                                    <numIndex index="1">NOTAND</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notand</label>
+                                    <value>NOTAND</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -308,30 +308,30 @@
                         <config>
                             <type>select</type>
                             <renderType>selectSingle</renderType>
-                            <items type="array">
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                            <items>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</label>
+                                    <value>0</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</label>
+                                    <value>1</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</label>
+                                    <value>2</value>
                                 </numIndex>
-                                <numIndex index="5" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</label>
+                                    <value>3</value>
                                 </numIndex>
-                                <numIndex index="6" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</label>
+                                    <value>4</value>
                                 </numIndex>
-                                <numIndex index="7" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
-                                    <numIndex index="1">250</numIndex>
+                                <numIndex index="5">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</label>
+                                    <value>250</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -456,9 +456,9 @@
                             <renderType>selectSingle</renderType>
                             <itemsProcFunc>DERHANSEN\SfEventMgt\Hooks\TemplateLayouts->user_templateLayout</itemsProcFunc>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Pieventdetail.xml b/Configuration/FlexForms/Pieventdetail.xml
index 146dbb3f5..33fa55a1d 100644
--- a/Configuration/FlexForms/Pieventdetail.xml
+++ b/Configuration/FlexForms/Pieventdetail.xml
@@ -52,30 +52,30 @@
                         <config>
                             <type>select</type>
                             <renderType>selectSingle</renderType>
-                            <items type="array">
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                            <items>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</label>
+                                    <value>0</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</label>
+                                    <value>1</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</label>
+                                    <value>2</value>
                                 </numIndex>
-                                <numIndex index="5" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</label>
+                                    <value>3</value>
                                 </numIndex>
-                                <numIndex index="6" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</label>
+                                    <value>4</value>
                                 </numIndex>
-                                <numIndex index="7" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
-                                    <numIndex index="1">250</numIndex>
+                                <numIndex index="5">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</label>
+                                    <value>250</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -183,9 +183,9 @@
                             <renderType>selectSingle</renderType>
                             <itemsProcFunc>DERHANSEN\SfEventMgt\Hooks\TemplateLayouts->user_templateLayout</itemsProcFunc>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Pieventlist.xml b/Configuration/FlexForms/Pieventlist.xml
index 761702531..1042ac652 100644
--- a/Configuration/FlexForms/Pieventlist.xml
+++ b/Configuration/FlexForms/Pieventlist.xml
@@ -14,25 +14,25 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.all</numIndex>
-                                    <numIndex index="1">all</numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.all</label>
+                                    <value>all</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.future</numIndex>
-                                    <numIndex index="1">future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.future</label>
+                                    <value>future</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</numIndex>
-                                    <numIndex index="1">current_future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</label>
+                                    <value>current_future</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.past</numIndex>
-                                    <numIndex index="1">past</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.past</label>
+                                    <value>past</value>
                                 </numIndex>
                                 <numIndex index="4">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.time_restriction</numIndex>
-                                    <numIndex index="1">time_restriction</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.time_restriction</label>
+                                    <value>time_restriction</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -92,21 +92,21 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</numIndex>
-                                    <numIndex index="1">title</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</label>
+                                    <value>title</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.startdate</numIndex>
-                                    <numIndex index="1">startdate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.startdate</label>
+                                    <value>startdate</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.enddate</numIndex>
-                                    <numIndex index="1">enddate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.enddate</label>
+                                    <value>enddate</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -119,17 +119,17 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</numIndex>
-                                    <numIndex index="1">asc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</label>
+                                    <value>asc</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</numIndex>
-                                    <numIndex index="1">desc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</label>
+                                    <value>desc</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -142,17 +142,17 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.none</numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.none</label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.exceptTopEvents</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.exceptTopEvents</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.onlyTopEvents</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.onlyTopEvents</label>
+                                    <value>2</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -175,25 +175,25 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.ignore</numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.ignore</label>
+                                    <value></value>
                                 </numIndex>
-                                <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.or</numIndex>
-                                    <numIndex index="1">OR</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.or</label>
+                                    <value>OR</value>
                                 </numIndex>
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.and</numIndex>
-                                    <numIndex index="1">AND</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.and</label>
+                                    <value>AND</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notor</numIndex>
-                                    <numIndex index="1">NOTOR</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notor</label>
+                                    <value>NOTOR</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notand</numIndex>
-                                    <numIndex index="1">NOTAND</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notand</label>
+                                    <value>NOTAND</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -308,30 +308,30 @@
                         <config>
                             <type>select</type>
                             <renderType>selectSingle</renderType>
-                            <items type="array">
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                            <items>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</label>
+                                    <value>0</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</label>
+                                    <value>1</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</label>
+                                    <value>2</value>
                                 </numIndex>
-                                <numIndex index="5" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</label>
+                                    <value>3</value>
                                 </numIndex>
-                                <numIndex index="6" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</label>
+                                    <value>4</value>
                                 </numIndex>
-                                <numIndex index="7" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
-                                    <numIndex index="1">250</numIndex>
+                                <numIndex index="5">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</label>
+                                    <value>250</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -498,9 +498,9 @@
                             <renderType>selectSingle</renderType>
                             <itemsProcFunc>DERHANSEN\SfEventMgt\Hooks\TemplateLayouts->user_templateLayout</itemsProcFunc>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                             </items>
                         </config>
@@ -553,16 +553,16 @@
                             <renderType>selectSingle</renderType>
                             <items>
                                 <numIndex index="0">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</numIndex>
-                                    <numIndex index="1">title</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</label>
+                                    <value>title</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.uid</numIndex>
-                                    <numIndex index="1">uid</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.uid</label>
+                                    <value>uid</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.sorting</numIndex>
-                                    <numIndex index="1">sorting</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.sorting</label>
+                                    <value>sorting</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -575,12 +575,12 @@
                             <renderType>selectSingle</renderType>
                             <items>
                                 <numIndex index="0">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</numIndex>
-                                    <numIndex index="1">asc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</label>
+                                    <value>asc</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</numIndex>
-                                    <numIndex index="1">desc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</label>
+                                    <value>desc</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Pieventregistration.xml b/Configuration/FlexForms/Pieventregistration.xml
index 70cf06c77..9218ea500 100644
--- a/Configuration/FlexForms/Pieventregistration.xml
+++ b/Configuration/FlexForms/Pieventregistration.xml
@@ -52,30 +52,30 @@
                         <config>
                             <type>select</type>
                             <renderType>selectSingle</renderType>
-                            <items type="array">
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                            <items>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</label>
+                                    <value>0</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</label>
+                                    <value>1</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</label>
+                                    <value>2</value>
                                 </numIndex>
-                                <numIndex index="5" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</label>
+                                    <value>3</value>
                                 </numIndex>
-                                <numIndex index="6" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</label>
+                                    <value>4</value>
                                 </numIndex>
-                                <numIndex index="7" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
-                                    <numIndex index="1">250</numIndex>
+                                <numIndex index="5">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</label>
+                                    <value>250</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -342,9 +342,9 @@
                             <renderType>selectSingle</renderType>
                             <itemsProcFunc>DERHANSEN\SfEventMgt\Hooks\TemplateLayouts->user_templateLayout</itemsProcFunc>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Pieventsearch.xml b/Configuration/FlexForms/Pieventsearch.xml
index 0f90b66d5..547d5b2c3 100644
--- a/Configuration/FlexForms/Pieventsearch.xml
+++ b/Configuration/FlexForms/Pieventsearch.xml
@@ -14,25 +14,25 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.all</numIndex>
-                                    <numIndex index="1">all</numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.all</label>
+                                    <value>all</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.future</numIndex>
-                                    <numIndex index="1">future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.future</label>
+                                    <value>future</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</numIndex>
-                                    <numIndex index="1">current_future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</label>
+                                    <value>current_future</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.past</numIndex>
-                                    <numIndex index="1">past</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.past</label>
+                                    <value>past</value>
                                 </numIndex>
                                 <numIndex index="4">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.time_restriction</numIndex>
-                                    <numIndex index="1">time_restriction</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.time_restriction</label>
+                                    <value>time_restriction</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -92,21 +92,21 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</numIndex>
-                                    <numIndex index="1">title</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</label>
+                                    <value>title</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.startdate</numIndex>
-                                    <numIndex index="1">startdate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.startdate</label>
+                                    <value>startdate</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.enddate</numIndex>
-                                    <numIndex index="1">enddate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.enddate</label>
+                                    <value>enddate</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -119,17 +119,17 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</numIndex>
-                                    <numIndex index="1">asc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</label>
+                                    <value>asc</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</numIndex>
-                                    <numIndex index="1">desc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</label>
+                                    <value>desc</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -142,17 +142,17 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.none</numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.none</label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.exceptTopEvents</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.exceptTopEvents</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.onlyTopEvents</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.onlyTopEvents</label>
+                                    <value>2</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -175,25 +175,25 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.ignore</numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.ignore</label>
+                                    <value></value>
                                 </numIndex>
-                                <numIndex index="1" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.or</numIndex>
-                                    <numIndex index="1">OR</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.or</label>
+                                    <value>OR</value>
                                 </numIndex>
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.and</numIndex>
-                                    <numIndex index="1">AND</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.and</label>
+                                    <value>AND</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notor</numIndex>
-                                    <numIndex index="1">NOTOR</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notor</label>
+                                    <value>NOTOR</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notand</numIndex>
-                                    <numIndex index="1">NOTAND</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.categoryConjunction.notand</label>
+                                    <value>NOTAND</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -308,30 +308,30 @@
                         <config>
                             <type>select</type>
                             <renderType>selectSingle</renderType>
-                            <items type="array">
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                            <items>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</label>
+                                    <value>0</value>
                                 </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</label>
+                                    <value>1</value>
                                 </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</label>
+                                    <value>2</value>
                                 </numIndex>
-                                <numIndex index="5" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</label>
+                                    <value>3</value>
                                 </numIndex>
-                                <numIndex index="6" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</label>
+                                    <value>4</value>
                                 </numIndex>
-                                <numIndex index="7" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
-                                    <numIndex index="1">250</numIndex>
+                                <numIndex index="5">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</label>
+                                    <value>250</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -456,9 +456,9 @@
                             <renderType>selectSingle</renderType>
                             <itemsProcFunc>DERHANSEN\SfEventMgt\Hooks\TemplateLayouts->user_templateLayout</itemsProcFunc>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                             </items>
                         </config>
@@ -511,16 +511,16 @@
                             <renderType>selectSingle</renderType>
                             <items>
                                 <numIndex index="0">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</numIndex>
-                                    <numIndex index="1">title</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.title</label>
+                                    <value>title</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.uid</numIndex>
-                                    <numIndex index="1">uid</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.uid</label>
+                                    <value>uid</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.sorting</numIndex>
-                                    <numIndex index="1">sorting</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.sorting</label>
+                                    <value>sorting</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -533,12 +533,12 @@
                             <renderType>selectSingle</renderType>
                             <items>
                                 <numIndex index="0">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</numIndex>
-                                    <numIndex index="1">asc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</label>
+                                    <value>asc</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</numIndex>
-                                    <numIndex index="1">desc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</label>
+                                    <value>desc</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/Configuration/FlexForms/Piuserreg.xml b/Configuration/FlexForms/Piuserreg.xml
index e9befe4b1..e2386a66d 100644
--- a/Configuration/FlexForms/Piuserreg.xml
+++ b/Configuration/FlexForms/Piuserreg.xml
@@ -14,21 +14,21 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.userRegistration.displayMode.all</numIndex>
-                                    <numIndex index="1">all</numIndex>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.userRegistration.displayMode.all</label>
+                                    <value>all</value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.userRegistration.displayMode.future</numIndex>
-                                    <numIndex index="1">future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.userRegistration.displayMode.future</label>
+                                    <value>future</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</numIndex>
-                                    <numIndex index="1">current_future</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.displayMode.current_future</label>
+                                    <value>current_future</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.userRegistration.displayMode.past</numIndex>
-                                    <numIndex index="1">past</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms.general.userRegistration.displayMode.past</label>
+                                    <value>past</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -41,21 +41,21 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.event.title</numIndex>
-                                    <numIndex index="1">event.title</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.event.title</label>
+                                    <value>event.title</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.event.startdate</numIndex>
-                                    <numIndex index="1">event.startdate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.event.startdate</label>
+                                    <value>event.startdate</value>
                                 </numIndex>
                                 <numIndex index="3">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderField.event.enddate</numIndex>
-                                    <numIndex index="1">event.enddate</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms.general.orderField.event.enddate</label>
+                                    <value>event.enddate</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -68,17 +68,17 @@
                             <type>select</type>
                             <renderType>selectSingle</renderType>
                             <items>
-                                <numIndex index="0" type="array">
-                                    <numIndex index="0"></numIndex>
-                                    <numIndex index="1"></numIndex>
+                                <numIndex index="0">
+                                    <label></label>
+                                    <value></value>
                                 </numIndex>
                                 <numIndex index="1">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.ascending</numIndex>
-                                    <numIndex index="1">asc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms.general.orderDirection.ascending</label>
+                                    <value>asc</value>
                                 </numIndex>
                                 <numIndex index="2">
-                                    <numIndex index="0">LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms_general.orderDirection.descending</numIndex>
-                                    <numIndex index="1">desc</numIndex>
+                                    <label>LLL:EXT:sf_event_mgt/Resources/Private/Language/locallang_be.xlf:flexforms.general.orderDirection.descending</label>
+                                    <value>desc</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -108,30 +108,30 @@
                         <config>
                             <type>select</type>
                             <renderType>selectSingle</renderType>
-                            <items type="array">
-                                <numIndex index="2" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</numIndex>
-                                    <numIndex index="1">0</numIndex>
-                                </numIndex>
-                                <numIndex index="3" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</numIndex>
-                                    <numIndex index="1">1</numIndex>
-                                </numIndex>
-                                <numIndex index="4" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</numIndex>
-                                    <numIndex index="1">2</numIndex>
-                                </numIndex>
-                                <numIndex index="5" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</numIndex>
-                                    <numIndex index="1">3</numIndex>
-                                </numIndex>
-                                <numIndex index="6" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</numIndex>
-                                    <numIndex index="1">4</numIndex>
-                                </numIndex>
-                                <numIndex index="7" type="array">
-                                    <numIndex index="0">LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</numIndex>
-                                    <numIndex index="1">250</numIndex>
+                            <items>
+                                <numIndex index="0">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.0</label>
+                                    <value>0</value>
+                                </numIndex>
+                                <numIndex index="1">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.1</label>
+                                    <value>1</value>
+                                </numIndex>
+                                <numIndex index="2">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.2</label>
+                                    <value>2</value>
+                                </numIndex>
+                                <numIndex index="3">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.3</label>
+                                    <value>3</value>
+                                </numIndex>
+                                <numIndex index="4">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.4</label>
+                                    <value>4</value>
+                                </numIndex>
+                                <numIndex index="5">
+                                    <label>LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:recursive.I.5</label>
+                                    <value>250</value>
                                 </numIndex>
                             </items>
                         </config>