diff --git a/packages/ep_products/Configuration/FlexForms/flexform_city_teaser.xml b/packages/ep_products/Configuration/FlexForms/flexform_city_teaser.xml
index 8ab82d4..80d2a3f 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_city_teaser.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_city_teaser.xml
@@ -19,8 +19,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0"/>
-                                    <numIndex index="1">0</numIndex>
+                                    <label/>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -37,8 +37,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0"/>
-                                    <numIndex index="1">0</numIndex>
+                                    <label/>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -53,12 +53,12 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Winter</numIndex>
-                                    <numIndex index="1">w</numIndex>
+                                    <label>Winter</label>
+                                    <value>w</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Sommer</numIndex>
-                                    <numIndex index="1">s</numIndex>
+                                    <label>Sommer</label>
+                                    <value>s</value>
                                 </numIndex>
                             </items>
                             <minitems>1</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_concept_detail.xml b/packages/ep_products/Configuration/FlexForms/flexform_concept_detail.xml
index 913c91b..e1e451b 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_concept_detail.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_concept_detail.xml
@@ -19,8 +19,8 @@
                             <foreign_table_where>AND tx_epproducts_domain_model_concept.hidden = 0 AND tx_epproducts_domain_model_concept.deleted = 0 ORDER BY tx_epproducts_domain_model_concept.name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>1</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_country.xml b/packages/ep_products/Configuration/FlexForms/flexform_country.xml
index 0260c7d..d610172 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_country.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_country.xml
@@ -19,8 +19,8 @@
                             <foreign_table_where>AND tx_epproducts_domain_model_country.hidden = 0 AND tx_epproducts_domain_model_country.deleted = 0 ORDER BY tx_epproducts_domain_model_country.name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0"/>
-                                    <numIndex index="1">0</numIndex>
+                                    <label/>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail.xml b/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail.xml
index f4356bc..31bb07c 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail.xml
@@ -19,8 +19,8 @@
                             <foreign_table_where>AND tx_epproducts_domain_model_hotel.hidden = 0 AND tx_epproducts_domain_model_hotel.deleted = 0 ORDER BY tx_epproducts_domain_model_hotel.name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml b/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml
index 030d874..acb7026 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_hotel_detail_event.xml
@@ -31,8 +31,8 @@
                             <foreign_table_where>AND tx_epproducts_domain_model_hotel.hidden = 0 AND tx_epproducts_domain_model_hotel.deleted = 0 ORDER BY tx_epproducts_domain_model_hotel.name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>1</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser.xml b/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser.xml
index 5599d58..e11b484 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser.xml
@@ -17,16 +17,16 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">vierspaltig</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>vierspaltig</label>
+                                    <value>4</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">dreispaltig</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>dreispaltig</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">zweispaltig</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>zweispaltig</label>
+                                    <value>2</value>
                                 </numIndex>
                             </items>
                             <minitems>1</minitems>
@@ -44,8 +44,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -63,8 +63,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -82,8 +82,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -100,8 +100,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -118,8 +118,8 @@
                             <foreign_table_where>ORDER BY name_internal</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -134,28 +134,28 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Standard</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>Standard</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">Basic</numIndex>
-                                    <numIndex index="1">5</numIndex>
+                                    <label>Basic</label>
+                                    <value>5</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">Komfort</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>Komfort</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="4" type="array">
-                                    <numIndex index="0">Deluxe</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>Deluxe</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="5" type="array">
-                                    <numIndex index="0">Superdeluxe</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>Superdeluxe</label>
+                                    <value>4</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -169,24 +169,24 @@
                             <renderType>selectCheckBox</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Ferienwohnung</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>Ferienwohnung</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Sportclub</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>Sportclub</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">Apartment</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>Apartment</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">G&#xE4;sterhaus</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>G&#xE4;sterhaus</label>
+                                    <value>4</value>
                                 </numIndex>
                                 <numIndex index="4" type="array">
-                                    <numIndex index="0">Pension</numIndex>
-                                    <numIndex index="1">5</numIndex>
+                                    <label>Pension</label>
+                                    <value>5</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser_date_independent.xml b/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser_date_independent.xml
index e71f029..5ccc6a3 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser_date_independent.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_hotel_teaser_date_independent.xml
@@ -17,16 +17,16 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">vierspaltig</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>vierspaltig</label>
+                                    <value>4</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">dreispaltig</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>dreispaltig</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">zweispaltig</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>zweispaltig</label>
+                                    <value>2</value>
                                 </numIndex>
                             </items>
                             <minitems>1</minitems>
@@ -44,8 +44,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -63,8 +63,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -81,8 +81,8 @@
                             <foreign_table_where>ORDER BY name_internal</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -97,28 +97,28 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Standard</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>Standard</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">Basic</numIndex>
-                                    <numIndex index="1">5</numIndex>
+                                    <label>Basic</label>
+                                    <value>5</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">Komfort</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>Komfort</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="4" type="array">
-                                    <numIndex index="0">Deluxe</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>Deluxe</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="5" type="array">
-                                    <numIndex index="0">Superdeluxe</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>Superdeluxe</label>
+                                    <value>4</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -132,24 +132,24 @@
                             <renderType>selectCheckBox</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Ferienwohnung</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>Ferienwohnung</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Sportclub</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>Sportclub</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">Apartment</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>Apartment</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">G&#xE4;sterhaus</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>G&#xE4;sterhaus</label>
+                                    <value>4</value>
                                 </numIndex>
                                 <numIndex index="4" type="array">
-                                    <numIndex index="0">Pension</numIndex>
-                                    <numIndex index="1">5</numIndex>
+                                    <label>Pension</label>
+                                    <value>5</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_pricetable.xml b/packages/ep_products/Configuration/FlexForms/flexform_pricetable.xml
index e239f77..dfbc915 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_pricetable.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_pricetable.xml
@@ -18,8 +18,8 @@
                             <default>Pricetable->event</default>
                             <items type="array">
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Preistabelle Eventreise</numIndex>
-                                    <numIndex index="1">Pricetable->event</numIndex>
+                                    <label>Preistabelle Eventreise</label>
+                                    <value>Pricetable->event</value>
                                 </numIndex>
                             </items>
                         </config>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_product_detail.xml b/packages/ep_products/Configuration/FlexForms/flexform_product_detail.xml
index aba512c..603e957 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_product_detail.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_product_detail.xml
@@ -19,8 +19,8 @@
                             <foreign_table_where>AND tx_epproducts_domain_model_product.hidden = 0 AND tx_epproducts_domain_model_product.deleted = 0 ORDER BY tx_epproducts_domain_model_product.name_internal</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -37,8 +37,8 @@
                             <foreign_table_where>AND tx_epproducts_domain_model_hotel.hidden = 0 AND tx_epproducts_domain_model_hotel.deleted = 0 ORDER BY tx_epproducts_domain_model_hotel.name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_product_pricetable.xml b/packages/ep_products/Configuration/FlexForms/flexform_product_pricetable.xml
index 030d874..acb7026 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_product_pricetable.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_product_pricetable.xml
@@ -31,8 +31,8 @@
                             <foreign_table_where>AND tx_epproducts_domain_model_hotel.hidden = 0 AND tx_epproducts_domain_model_hotel.deleted = 0 ORDER BY tx_epproducts_domain_model_hotel.name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>1</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_product_teaser.xml b/packages/ep_products/Configuration/FlexForms/flexform_product_teaser.xml
index 1f9a34b..d4c83e4 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_product_teaser.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_product_teaser.xml
@@ -18,12 +18,12 @@
                             <default>Product->teasergroup</default>
                             <items type="array">
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Teasergruppe</numIndex>
-                                    <numIndex index="1">Product->teasergroup</numIndex>
+                                    <label>Teasergruppe</label>
+                                    <value>Product->teasergroup</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">Einzelteaser</numIndex>
-                                    <numIndex index="1">Product->teaser</numIndex>
+                                    <label>Einzelteaser</label>
+                                    <value>Product->teaser</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -40,8 +40,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -60,8 +60,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -80,8 +80,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Keine Zuordnung</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Keine Zuordnung</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <size>5</size>
@@ -98,8 +98,8 @@
                             <foreign_table_where>ORDER BY name</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -147,8 +147,8 @@
                             <foreign_table_where>ORDER BY name_internal</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Alle</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Alle</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -165,12 +165,12 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Spalten</numIndex>
-                                    <numIndex index="1">cols</numIndex>
+                                    <label>Spalten</label>
+                                    <value>cols</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Reihen</numIndex>
-                                    <numIndex index="1">rows</numIndex>
+                                    <label>Reihen</label>
+                                    <value>rows</value>
                                 </numIndex>
                             </items>
                         </config>
@@ -185,24 +185,24 @@
                             <renderType>selectCheckBox</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Ferienwohnung</numIndex>
-                                    <numIndex index="1">1</numIndex>
+                                    <label>Ferienwohnung</label>
+                                    <value>1</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Sportclub</numIndex>
-                                    <numIndex index="1">2</numIndex>
+                                    <label>Sportclub</label>
+                                    <value>2</value>
                                 </numIndex>
                                 <numIndex index="2" type="array">
-                                    <numIndex index="0">Apartment</numIndex>
-                                    <numIndex index="1">3</numIndex>
+                                    <label>Apartment</label>
+                                    <value>3</value>
                                 </numIndex>
                                 <numIndex index="3" type="array">
-                                    <numIndex index="0">G&#xE4;stehaus</numIndex>
-                                    <numIndex index="1">4</numIndex>
+                                    <label>G&#xE4;stehaus</label>
+                                    <value>4</value>
                                 </numIndex>
                                 <numIndex index="4" type="array">
-                                    <numIndex index="0">Pension</numIndex>
-                                    <numIndex index="1">5</numIndex>
+                                    <label>Pension</label>
+                                    <value>5</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
@@ -228,8 +228,8 @@
                             <foreign_table_where>ORDER BY title</foreign_table_where>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Default</numIndex>
-                                    <numIndex index="1">0</numIndex>
+                                    <label>Default</label>
+                                    <value>0</value>
                                 </numIndex>
                             </items>
                             <minitems>0</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_region_teaser.xml b/packages/ep_products/Configuration/FlexForms/flexform_region_teaser.xml
index 411f576..347aae6 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_region_teaser.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_region_teaser.xml
@@ -29,12 +29,12 @@
                             <renderType>selectSingle</renderType>
                             <items type="array">
                                 <numIndex index="0" type="array">
-                                    <numIndex index="0">Winter</numIndex>
-                                    <numIndex index="1">w</numIndex>
+                                    <label>Winter</label>
+                                    <value>w</value>
                                 </numIndex>
                                 <numIndex index="1" type="array">
-                                    <numIndex index="0">Sommer</numIndex>
-                                    <numIndex index="1">s</numIndex>
+                                    <label>Sommer</label>
+                                    <value>s</value>
                                 </numIndex>
                             </items>
                             <minitems>1</minitems>
diff --git a/packages/ep_products/Configuration/FlexForms/flexform_teammembers.xml b/packages/ep_products/Configuration/FlexForms/flexform_teammembers.xml
index 6360fa8..ffdbc8e 100644
--- a/packages/ep_products/Configuration/FlexForms/flexform_teammembers.xml
+++ b/packages/ep_products/Configuration/FlexForms/flexform_teammembers.xml
@@ -33,7 +33,6 @@
                         <config>
                             <type>select</type>
                             <renderType>selectMultipleSideBySide</renderType>
-                            <enableMultiSelectFilterTextfield>1</enableMultiSelectFilterTextfield>
                             <foreign_table>sys_category</foreign_table>
                             <minitems>0</minitems>
                             <maxitems>99</maxitems>