diff --git a/forms-shared/src/example-forms/examples/oloEnergetickeZhodnotenieOdpaduVZevoExample.ts b/forms-shared/src/example-forms/examples/oloEnergetickeZhodnotenieOdpaduVZevoExample.ts
index cbf870f13..403ac4179 100644
--- a/forms-shared/src/example-forms/examples/oloEnergetickeZhodnotenieOdpaduVZevoExample.ts
+++ b/forms-shared/src/example-forms/examples/oloEnergetickeZhodnotenieOdpaduVZevoExample.ts
@@ -9,9 +9,6 @@ const exampleForm: ExampleForm = {
       email: 'olo@test.sk',
       vyberSluzby: 'Ručná vykládka a zhodnotenie odpadu podľa integrovaného povolenia',
       preferovanyDatumDovozu: '2025-11-08',
-      fakturacia: {
-        sposobPlatby: 'Platba kartou',
-      },
       menoPriezvisko: {
         meno: 'Jozef',
         priezvisko: 'Mrkva',
diff --git a/forms-shared/src/example-forms/examples/oloOloTaxiExample.ts b/forms-shared/src/example-forms/examples/oloOloTaxiExample.ts
index b8a2ebb19..2dd045c7d 100644
--- a/forms-shared/src/example-forms/examples/oloOloTaxiExample.ts
+++ b/forms-shared/src/example-forms/examples/oloOloTaxiExample.ts
@@ -22,9 +22,9 @@ const exampleForm: ExampleForm = {
     sluzba: {
       miestoDodania: 'Holandská 10',
       preferovanyDatumOdvozu: '2025-05-05',
-      preferovanyCasOdvozu: '07:55',
+      preferovanyCasOdvozu: '07:00 (pondelok - sobota)',
       mnozstvoADruhOdpadu: 'Lots of paper.',
-      suhlasSDarom: true,
+      suhlasSPlatbou: true,
     },
     suhlasy: {
       suhlas: true,
diff --git a/forms-shared/src/generator/helpers.ts b/forms-shared/src/generator/helpers.ts
index 331a414bd..12ab4cc49 100644
--- a/forms-shared/src/generator/helpers.ts
+++ b/forms-shared/src/generator/helpers.ts
@@ -150,6 +150,24 @@ export const createStringOptions = (options: string[], addDefault = true) => {
   return result
 }
 
+/**
+ * Create options from a list of objects with titles. For example:
+ * [{ title: 'Option 1' }, { title: 'Option 2' }] => [{ value: 'Option 1', title: 'Option 1', isDefault: true }, ...]
+ */
+export const createStringOptionsV2 = <Option extends { title: string }>(
+  options: Option[],
+  addDefault = true,
+) => {
+  const result = options.map((option, index) => ({
+    value: option.title,
+    ...option,
+    isDefault: index === 0 && addDefault ? true : undefined,
+  }))
+
+  assertUniqueOptions(result)
+  return result
+}
+
 /**
  * Create options with camelCase value from a list of strings. For example:
  * ['Option 1', 'Option 2'] => [{ value: 'option1', title: 'Option 1', isDefault: true }, ...]
diff --git a/forms-shared/src/schemas/olo/docisteniStanovistaZbernychNadob.ts b/forms-shared/src/schemas/olo/docisteniStanovistaZbernychNadob.ts
index 5b5d2e38f..f15af687e 100644
--- a/forms-shared/src/schemas/olo/docisteniStanovistaZbernychNadob.ts
+++ b/forms-shared/src/schemas/olo/docisteniStanovistaZbernychNadob.ts
@@ -65,15 +65,19 @@ export default schema({ title: 'Dočistenie stanovišťa zberných nádob' }, {}
       ],
     ),
     conditionalFields(createCondition([[['ziadatelTyp'], { const: 'Právnická osoba' }]]), [
-      input('konatel', { type: 'text', title: 'Konateľ (meno, priezvisko)', required: true }, {}),
+      input(
+        'konatel',
+        { type: 'text', title: 'Konateľ', required: true },
+        { helptextHeader: 'Uveďte meno a priezvisko konateľa' },
+      ),
       input(
         'zastupeny',
         {
           type: 'text',
-          title: 'Zastúpený - na základe splnomocnenia (meno, priezvisko)',
+          title: 'Zastúpený - na základe splnomocnenia',
           required: true,
         },
-        {},
+        { helptextHeader: 'Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia' },
       ),
     ]),
     conditionalFields(
@@ -164,7 +168,7 @@ export default schema({ title: 'Dočistenie stanovišťa zberných nádob' }, {}
       'doplnujuceInfo',
       {
         title: 'Doplňujúce info',
-        required: true,
+        required: false,
       },
       {
         helptextHeader: 'Špecifikujte individuálne požiadavky.',
diff --git a/forms-shared/src/schemas/olo/koloTaxi.ts b/forms-shared/src/schemas/olo/koloTaxi.ts
index 4e08ca977..f92003a62 100644
--- a/forms-shared/src/schemas/olo/koloTaxi.ts
+++ b/forms-shared/src/schemas/olo/koloTaxi.ts
@@ -54,15 +54,19 @@ export default schema({ title: 'KOLO Taxi' }, {}, [
       conditionalFields(createCondition([[['platcaDph'], { const: true }]]), [
         input('icDph', { type: 'text', title: 'IČ DPH', required: true }, {}),
       ]),
-      input('konatel', { type: 'text', title: 'Konateľ (meno, priezvisko)', required: true }, {}),
+      input(
+        'konatel',
+        { type: 'text', title: 'Konateľ', required: true },
+        { helptextHeader: 'Uveďte meno a priezvisko konateľa' },
+      ),
       input(
         'zastupeny',
         {
           type: 'text',
-          title: 'Zastúpený - na základe splnomocnenia (meno, priezvisko)',
+          title: 'Zastúpený - na základe splnomocnenia',
           required: true,
         },
-        {},
+        { helptextHeader: 'Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia' },
       ),
       input(
         'menoKontaktnejOsoby',
diff --git a/forms-shared/src/schemas/olo/mimoriadnyOdvozAZhodnotenieOdpadu.ts b/forms-shared/src/schemas/olo/mimoriadnyOdvozAZhodnotenieOdpadu.ts
index b9ccfc037..7fabf98d0 100644
--- a/forms-shared/src/schemas/olo/mimoriadnyOdvozAZhodnotenieOdpadu.ts
+++ b/forms-shared/src/schemas/olo/mimoriadnyOdvozAZhodnotenieOdpadu.ts
@@ -74,15 +74,21 @@ export default schema(
         ],
       ),
       conditionalFields(createCondition([[['ziadatelTyp'], { const: 'Právnická osoba' }]]), [
-        input('konatel', { type: 'text', title: 'Konateľ (meno, priezvisko)', required: true }, {}),
+        input(
+          'konatel',
+          { type: 'text', title: 'Konateľ', required: true },
+          { helptextHeader: 'Uveďte meno a priezvisko konateľa' },
+        ),
         input(
           'zastupeny',
           {
             type: 'text',
-            title: 'Zastúpený - na základe splnomocnenia (meno, priezvisko)',
+            title: 'Zastúpený - na základe splnomocnenia',
             required: true,
           },
-          {},
+          {
+            helptextHeader: 'Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia',
+          },
         ),
       ]),
       conditionalFields(
diff --git a/forms-shared/src/schemas/olo/odvozObjemnehoOdpaduValnikom.ts b/forms-shared/src/schemas/olo/odvozObjemnehoOdpaduValnikom.ts
index fa2f7ba15..e30be3445 100644
--- a/forms-shared/src/schemas/olo/odvozObjemnehoOdpaduValnikom.ts
+++ b/forms-shared/src/schemas/olo/odvozObjemnehoOdpaduValnikom.ts
@@ -41,14 +41,14 @@ export default schema({ title: 'Odvoz objemného odpadu valníkom' }, {}, [
     conditionalFields(createCondition([[['ziadatelTyp'], { const: 'Právnická osoba' }]]), [
       input(
         'konatel',
-        { type: 'text', title: 'Konateľ (meno, priezvisko)', required: true },
+        { type: 'text', title: 'Konateľ', required: true },
         { helptextHeader: 'Uveďte meno a priezvisko konateľa' },
       ),
       input(
         'zastupeny',
         {
           type: 'text',
-          title: 'Zastúpený - na základe splnomocnenia (meno, priezvisko)',
+          title: 'Zastúpený - na základe splnomocnenia',
           required: true,
         },
         { helptextHeader: 'Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia' },
diff --git a/forms-shared/src/schemas/olo/odvozOdpaduVelkokapacitnymAleboLisovacimKontajnerom.ts b/forms-shared/src/schemas/olo/odvozOdpaduVelkokapacitnymAleboLisovacimKontajnerom.ts
index f293f3001..f0c7156ae 100644
--- a/forms-shared/src/schemas/olo/odvozOdpaduVelkokapacitnymAleboLisovacimKontajnerom.ts
+++ b/forms-shared/src/schemas/olo/odvozOdpaduVelkokapacitnymAleboLisovacimKontajnerom.ts
@@ -66,15 +66,19 @@ export default schema({ title: 'Odvoz odpadu veľkokapacitným alebo lisovacím
       ],
     ),
     conditionalFields(createCondition([[['ziadatelTyp'], { const: 'Právnická osoba' }]]), [
-      input('konatel', { type: 'text', title: 'Konateľ (meno, priezvisko)', required: true }, {}),
+      input(
+        'konatel',
+        { type: 'text', title: 'Konateľ', required: true },
+        { helptextHeader: 'Uveďte meno a priezvisko konateľa' },
+      ),
       input(
         'zastupeny',
         {
           type: 'text',
-          title: 'Zastúpený - na základe splnomocnenia (meno, priezvisko)',
+          title: 'Zastúpený - na základe splnomocnenia',
           required: true,
         },
-        {},
+        { helptextHeader: 'Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia' },
       ),
     ]),
     conditionalFields(
@@ -121,7 +125,7 @@ export default schema({ title: 'Odvoz odpadu veľkokapacitným alebo lisovacím
     input(
       'miestoDodania',
       { type: 'text', title: 'Miesto dodania / výkonu služby', required: true },
-      { helptextHeader: 'Presná adresa' },
+      { helptextHeader: 'Vyplňte vo formáte ulica a číslo' },
     ),
     select(
       'druhOdpadu',
diff --git a/forms-shared/src/schemas/olo/oloTaxi.ts b/forms-shared/src/schemas/olo/oloTaxi.ts
index b06979998..6b8163718 100644
--- a/forms-shared/src/schemas/olo/oloTaxi.ts
+++ b/forms-shared/src/schemas/olo/oloTaxi.ts
@@ -6,9 +6,9 @@ import {
   object,
   radioGroup,
   schema,
+  select,
   step,
   textArea,
-  timePicker,
 } from '../../generator/functions'
 import { sharedAddressField, sharedPhoneNumberField } from '../shared/fields'
 import { createStringOptions } from '../../generator/helpers'
@@ -72,16 +72,22 @@ export default schema(
             'Vami zvolený dátum má iba informačný charakter. Objednávku je potrebné podať minimálne 2 pracovné dni pred zvoleným termínom. V prípade, ak vami zvolený termín nebude voľný, budeme vás kontaktovať.',
         },
       ),
-      timePicker(
+      select(
         'preferovanyCasOdvozu',
         {
           title: 'Preferovaný čas odvozu',
           required: true,
+          options: createStringOptions(
+            [
+              '07:00 (pondelok - sobota)',
+              '09:00 (pondelok - sobota)',
+              '11:00 (pondelok - sobota)',
+              '13:00 (pondelok - piatok)',
+            ],
+            false,
+          ),
         },
-        {
-          helptextHeader:
-            '7:00  (Pon - Sob); 9:00 (Pon - Sob); 11:00 (Pon - Sob); 13:00 (Pon - Pia)',
-        },
+        {},
       ),
       textArea(
         'mnozstvoADruhOdpadu',
@@ -94,7 +100,7 @@ export default schema(
         },
       ),
       checkbox(
-        'suhlasSDarom',
+        'suhlasSPlatbou',
         {
           title: 'Vyjadrenie súhlasu s platbou',
           required: true,
diff --git a/forms-shared/src/schemas/olo/podnetyAPochvalyObcanov.ts b/forms-shared/src/schemas/olo/podnetyAPochvalyObcanov.ts
index 3a4b7a85f..117c58a50 100644
--- a/forms-shared/src/schemas/olo/podnetyAPochvalyObcanov.ts
+++ b/forms-shared/src/schemas/olo/podnetyAPochvalyObcanov.ts
@@ -72,7 +72,9 @@ export default schema({ title: 'Podnety a pochvaly občanov' }, {}, [
           title: 'Presná adresa miesta odvozu',
           required: true,
         },
-        {},
+        {
+          helptextHeader: 'Vyplňte vo formáte ulica a číslo',
+        },
       ),
     ]),
     conditionalFields(createCondition([[['kategoriaPodnetu'], { const: 'Pracovníci OLO' }]]), [
diff --git a/forms-shared/src/schemas/olo/shared/zevoShared.ts b/forms-shared/src/schemas/olo/shared/zevoShared.ts
index 77ef0b988..248282f0f 100644
--- a/forms-shared/src/schemas/olo/shared/zevoShared.ts
+++ b/forms-shared/src/schemas/olo/shared/zevoShared.ts
@@ -89,15 +89,21 @@ export const getZevoSchema = (type: ZevoType) => [
         conditionalFields(createCondition([[['platcaDph'], { const: true }]]), [
           input('icDph', { type: 'text', title: 'IČ DPH', required: true }, {}),
         ]),
-        input('konatel', { type: 'text', title: 'Konateľ (meno, priezvisko)', required: true }, {}),
+        input(
+          'konatel',
+          { type: 'text', title: 'Konateľ', required: true },
+          { helptextHeader: 'Uveďte meno a priezvisko konateľa' },
+        ),
         input(
           'zastupeny',
           {
             type: 'text',
-            title: 'Zastúpený - na základe splnomocnenia (meno, priezvisko)',
+            title: 'Zastúpený - na základe splnomocnenia',
             required: true,
           },
-          {},
+          {
+            helptextHeader: 'Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia',
+          },
         ),
         input(
           'kontaktnaOsoba',
@@ -160,52 +166,54 @@ export const getZevoSchema = (type: ZevoType) => [
           ],
         )
       : null,
-    object('fakturacia', { required: true }, { objectDisplay: 'boxed', title: 'Fakturácia' }, [
-      radioGroup(
-        'sposobPlatby',
-        {
-          type: 'string',
-          title: 'Spôsob platby',
-          required: true,
-          options: createStringOptions(['Platba kartou', 'Platba na faktúru']),
-        },
-        { variant: 'boxed', orientations: 'column' },
-      ),
-      conditionalFields(createCondition([[['sposobPlatby'], { const: 'Platba na faktúru' }]]), [
-        checkbox(
-          'elektronickaFaktura',
-          {
-            title: 'Súhlasím so zaslaním elektronickej faktúry',
-          },
-          {
-            helptextHeader:
-              'V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.',
-            checkboxLabel: 'Súhlasím so zaslaním elektronickej faktúry',
-            variant: 'boxed',
-          },
-        ),
-        conditionalFields(createCondition([[['elektronickaFaktura'], { const: true }]]), [
-          input(
-            'emailPreFaktury',
+    conditionalFields(
+      createCondition([
+        [
+          ['ziadatelTyp'],
+          { enum: ['Právnická osoba', 'Právnická osoba s povolením na vstup do ZEVO'] },
+        ],
+      ]),
+      [
+        object('fakturacia', { required: true }, { objectDisplay: 'boxed', title: 'Fakturácia' }, [
+          radioGroup(
+            'sposobPlatby',
             {
-              type: 'email',
-              title: 'E-mail pre zasielanie elektronických faktúr',
+              type: 'string',
+              title: 'Spôsob platby',
               required: true,
+              options: createStringOptions(['Platba kartou', 'Platba na faktúru']),
             },
-            {},
+            { variant: 'boxed', orientations: 'column' },
           ),
+          conditionalFields(createCondition([[['sposobPlatby'], { const: 'Platba na faktúru' }]]), [
+            input('iban', { type: 'ba-iban', title: 'IBAN', required: true }, {}),
+            checkbox(
+              'elektronickaFaktura',
+              {
+                title: 'Súhlasím so zaslaním elektronickej faktúry',
+              },
+              {
+                helptextHeader:
+                  'V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.',
+                checkboxLabel: 'Súhlasím so zaslaním elektronickej faktúry',
+                variant: 'boxed',
+              },
+            ),
+            conditionalFields(createCondition([[['elektronickaFaktura'], { const: true }]]), [
+              input(
+                'emailPreFaktury',
+                {
+                  type: 'email',
+                  title: 'E-mail pre zasielanie elektronických faktúr',
+                  required: true,
+                },
+                {},
+              ),
+            ]),
+          ]),
         ]),
-      ]),
-      conditionalFields(
-        createCondition([
-          [
-            ['ziadatelTyp'],
-            { enum: ['Právnická osoba', 'Právnická osoba s povolením na vstup do ZEVO'] },
-          ],
-        ]),
-        [input('iban', { type: 'ba-iban', title: 'IBAN', required: true }, {})],
-      ),
-    ]),
+      ],
+    ),
   ]),
   type === ZevoType.EnergetickeZhodnotenieOdpaduVZevo
     ? step('povodcaOdpadu', { title: 'Identifikačné údaje pôvodcu odpadu' }, [
diff --git a/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPrePravnickeOsoby.ts b/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPrePravnickeOsoby.ts
index 76eae40fd..25bf6d4f7 100644
--- a/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPrePravnickeOsoby.ts
+++ b/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPrePravnickeOsoby.ts
@@ -12,11 +12,52 @@ import {
   select,
   step,
 } from '../../generator/functions'
-import { createCondition, createStringOptions } from '../../generator/helpers'
+import {
+  createCondition,
+  createStringOptions,
+  createStringOptionsV2,
+} from '../../generator/helpers'
 import { sharedAddressField, sharedPhoneNumberField } from '../shared/fields'
 import { GenericObjectType } from '@rjsf/utils'
 import { safeString } from '../../form-utils/safeData'
 
+const getFakturacia = (novyOdberatel: boolean) =>
+  object(
+    novyOdberatel ? 'fakturaciaNovehoOdoberatela' : 'fakturacia',
+    { required: true },
+    { objectDisplay: 'boxed', title: 'Fakturácia' },
+    [
+      input(
+        'iban',
+        { type: 'ba-iban', title: novyOdberatel ? 'Nový IBAN' : 'IBAN', required: true },
+        {},
+      ),
+      checkbox(
+        'elektronickaFaktura',
+        {
+          title: 'Súhlasím so zaslaním elektronickej faktúry',
+        },
+        {
+          helptextHeader:
+            'V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.',
+          checkboxLabel: 'Súhlasím so zaslaním elektronickej faktúry',
+          variant: 'boxed',
+        },
+      ),
+      conditionalFields(createCondition([[['elektronickaFaktura'], { const: true }]]), [
+        input(
+          'emailPreFaktury',
+          {
+            type: 'text',
+            title: 'E-mail pre zasielanie elektronických faktúr',
+            required: true,
+          },
+          {},
+        ),
+      ]),
+    ],
+  )
+
 export default schema(
   {
     title: 'Triedený zber papiera, plastov a skla pre právnické osoby',
@@ -30,18 +71,28 @@ export default schema(
           type: 'string',
           title: 'Typ odberateľa',
           required: true,
-          options: createStringOptions([
-            'Nový',
-            'Existujúci',
-            'Zmena poplatkovej povinnosti pre existujúceho zákazníka',
-            'Zmena odberateľa',
+          options: createStringOptionsV2([
+            {
+              title: 'Nový',
+              description: 'Nemám uzavretú zmluvu',
+            },
+            {
+              title: 'Existujúci',
+              description: 'Mám uzavretú zmluvu',
+            },
+            {
+              title: 'Zmena poplatkovej povinnosti pre existujúceho zákazníka',
+              description: 'Spoplatnenie služby',
+            },
+            {
+              title: 'Zmena odberateľa',
+              description: 'Napr. preberám prevádzku alebo správu nehnuteľnosti',
+            },
           ]),
         },
         {
           variant: 'boxed',
           orientations: 'column',
-          helptextHeader:
-            'Nový (nemám uzavretú zmluvu), Existujúci (mám uzavretú zmluvu), Zmena poplatkovej povinnosti (spoplatnenie služby), Zmena odberateľa (napr. preberám prevádzku alebo správu nehnuteľnosti)',
         },
       ),
       input('nazovOrganizacie', { type: 'text', title: 'Názov organizácie', required: true }, {}),
@@ -50,50 +101,29 @@ export default schema(
         input('cisloZmluvy', { type: 'text', title: 'Číslo zmluvy', required: true }, {}),
       ]),
       conditionalFields(
-        createCondition([
-          [
-            ['typOdberatela'],
-            {
-              enum: [
-                'Nový',
-                'Existujúci',
-                'Zmena poplatkovej povinnosti pre existujúceho zákazníka',
-              ],
-            },
-          ],
-        ]),
-        [input('ico', { type: 'text', title: 'IČO', required: true }, {})],
-      ),
-      conditionalFields(createCondition([[['typOdberatela'], { const: 'Zmena odberateľa' }]]), [
-        input(
-          'icoPovodnehOdberatela',
-          { type: 'text', title: 'IČO pôvodného odberateľa', required: true },
-          {},
-        ),
-        input('noveIco', { type: 'text', title: 'Nové IČO', required: true }, {}),
-        datePicker(
-          'datumZmeny',
-          { title: 'Dátum zmeny', required: true },
-          { helptextHeader: 'Uveďte dátum predpokladanej zmeny odberateľa' },
-        ),
-      ]),
-      conditionalFields(
-        createCondition([
-          [
-            ['typOdberatela'],
-            {
-              enum: ['Zmena odberateľa'],
-            },
-          ],
-        ]),
+        createCondition([[['typOdberatela'], { const: 'Zmena odberateľa' }]]),
         [
+          input(
+            'icoPovodnehoOdberatela',
+            { type: 'text', title: 'IČO pôvodného odberateľa', required: true },
+            {},
+          ),
+          input('noveIco', { type: 'text', title: 'Nové IČO', required: true }, {}),
           input(
             'dicNovehoOdberatela',
             { type: 'text', title: 'DIČ nového odberateľa', required: true },
             {},
           ),
+          datePicker(
+            'datumZmeny',
+            { title: 'Dátum zmeny', required: true },
+            { helptextHeader: 'Uveďte dátum predpokladanej zmeny odberateľa' },
+          ),
+        ],
+        [
+          input('ico', { type: 'text', title: 'IČO', required: true }, {}),
+          input('dic', { type: 'text', title: 'DIČ', required: true }, {}),
         ],
-        [input('dic', { type: 'text', title: 'DIČ', required: true }, {})],
       ),
       checkbox(
         'platcaDph',
@@ -103,45 +133,45 @@ export default schema(
       conditionalFields(createCondition([[['platcaDph'], { const: true }]]), [
         input('icDph', { type: 'text', title: 'IČ DPH', required: true }, {}),
       ]),
-      input('konatel', { type: 'text', title: 'Konateľ (meno, priezvisko)', required: true }, {}),
+      input(
+        'konatel',
+        { type: 'text', title: 'Konateľ', required: true },
+        { helptextHeader: 'Uveďte meno a priezvisko konateľa' },
+      ),
       input(
         'zastupeny',
         {
           type: 'text',
-          title: 'Zastúpený - na základe splnomocnenia (meno, priezvisko)',
+          title: 'Zastúpený - na základe splnomocnenia',
           required: true,
         },
-        {},
+        { helptextHeader: 'Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia' },
       ),
       input(
         'menoKontaktnejOsoby',
         { type: 'text', title: 'Meno kontaktnej osoby', required: true },
         {},
       ),
-      sharedPhoneNumberField('telefon', true),
-      input('email', { title: 'Email', required: true, type: 'email' }, {}),
-      object('fakturacia', { required: true }, { objectDisplay: 'boxed', title: 'Fakturácia' }, [
-        input('iban', { type: 'ba-iban', title: 'IBAN', required: true }, {}),
-        checkbox(
-          'elektronickaFaktura',
-          {
-            title: 'Súhlasím so zaslaním elektronickej faktúry',
-          },
-          {
-            helptextHeader:
-              'V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.',
-            checkboxLabel: 'Súhlasím so zaslaním elektronickej faktúry',
-            variant: 'boxed',
-          },
-        ),
-        conditionalFields(createCondition([[['elektronickaFaktura'], { const: true }]]), [
+      conditionalFields(
+        createCondition([[['typOdberatela'], { const: 'Zmena odberateľa' }]]),
+        [
           input(
-            'emailPreFaktury',
-            { type: 'text', title: 'E-mail pre zasielanie elektronických faktúr', required: true },
-            {},
+            'noveTelefonneCislo',
+            { type: 'ba-phone-number', title: 'Nové telefónne číslo', required: true },
+            { size: 'medium', placeholder: '+421' },
           ),
-        ]),
-      ]),
+          input('novyEmail', { title: 'Nový email', required: true, type: 'email' }, {}),
+        ],
+        [
+          sharedPhoneNumberField('telefon', true),
+          input('email', { title: 'Email', required: true, type: 'email' }, {}),
+        ],
+      ),
+      conditionalFields(
+        createCondition([[['typOdberatela'], { enum: ['Zmena odberateľa'] }]]),
+        [getFakturacia(true)],
+        [getFakturacia(false)],
+      ),
       conditionalFields(
         createCondition([
           [
@@ -181,7 +211,7 @@ export default schema(
           input(
             'miestoDodania',
             { type: 'text', title: 'Miesto dodania / výkonu služby', required: true },
-            { helptextHeader: 'Presná adresa' },
+            { helptextHeader: 'Vyplňte vo formáte ulica a číslo' },
           ),
           select(
             'druhOdpadu',
diff --git a/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPreSpravcovskeSpolocnosti.ts b/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPreSpravcovskeSpolocnosti.ts
index c2b3bdf38..f4e1d826b 100644
--- a/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPreSpravcovskeSpolocnosti.ts
+++ b/forms-shared/src/schemas/olo/triedenyZberPapieraPlastovASklaPreSpravcovskeSpolocnosti.ts
@@ -13,11 +13,52 @@ import {
   select,
   step,
 } from '../../generator/functions'
-import { createCondition, createStringOptions } from '../../generator/helpers'
+import {
+  createCondition,
+  createStringOptions,
+  createStringOptionsV2,
+} from '../../generator/helpers'
 import { sharedAddressField, sharedPhoneNumberField } from '../shared/fields'
 import { safeString } from '../../form-utils/safeData'
 import { GenericObjectType } from '@rjsf/utils'
 
+const getFakturacia = (novyOdberatel: boolean) =>
+  object(
+    novyOdberatel ? 'fakturaciaNovehoOdoberatela' : 'fakturacia',
+    { required: true },
+    { objectDisplay: 'boxed', title: 'Fakturácia' },
+    [
+      input(
+        'iban',
+        { type: 'ba-iban', title: novyOdberatel ? 'Nový IBAN' : 'IBAN', required: true },
+        {},
+      ),
+      checkbox(
+        'elektronickaFaktura',
+        {
+          title: 'Súhlasím so zaslaním elektronickej faktúry',
+        },
+        {
+          helptextHeader:
+            'V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.',
+          checkboxLabel: 'Súhlasím so zaslaním elektronickej faktúry',
+          variant: 'boxed',
+        },
+      ),
+      conditionalFields(createCondition([[['elektronickaFaktura'], { const: true }]]), [
+        input(
+          'emailPreFaktury',
+          {
+            type: 'text',
+            title: 'E-mail pre zasielanie elektronických faktúr',
+            required: true,
+          },
+          {},
+        ),
+      ]),
+    ],
+  )
+
 export default schema(
   {
     title: 'Triedený zber papiera, plastov a skla pre správcovské spoločnosti',
@@ -31,13 +72,24 @@ export default schema(
           type: 'string',
           title: 'Typ odberateľa',
           required: true,
-          options: createStringOptions(['Nový', 'Existujúci', 'Zmena odberateľa']),
+          options: createStringOptionsV2([
+            {
+              title: 'Nový',
+              description: 'Nemám uzavretú zmluvu',
+            },
+            {
+              title: 'Existujúci',
+              description: 'Mám uzavretú zmluvu',
+            },
+            {
+              title: 'Zmena odberateľa',
+              description: 'Napr. preberám prevádzku alebo správu nehnuteľnosti',
+            },
+          ]),
         },
         {
           variant: 'boxed',
           orientations: 'column',
-          helptextHeader:
-            'Nový (nemám uzavretú zmluvu), Existujúci (mám uzavretú zmluvu), Zmena odberateľa (napr. preberám prevádzku alebo správu nehnuteľnosti)',
         },
       ),
       conditionalFields(
@@ -77,34 +129,25 @@ export default schema(
       conditionalFields(createCondition([[['typOdberatela'], { enum: ['Nový', 'Existujúci'] }]]), [
         input('ico', { type: 'text', title: 'IČO', required: true }, {}),
       ]),
-      conditionalFields(createCondition([[['typOdberatela'], { const: 'Zmena odberateľa' }]]), [
-        input(
-          'icoPovodnehOdberatela',
-          { type: 'text', title: 'IČO pôvodného odberateľa', required: true },
-          {},
-        ),
-        input('noveIco', { type: 'text', title: 'Nové IČO', required: true }, {}),
-        datePicker(
-          'datumZmeny',
-          { title: 'Dátum zmeny', required: true },
-          { helptextHeader: 'Uveďte dátum predpokladanej zmeny odberateľa' },
-        ),
-      ]),
       conditionalFields(
-        createCondition([
-          [
-            ['typOdberatela'],
-            {
-              enum: ['Zmena odberateľa'],
-            },
-          ],
-        ]),
+        createCondition([[['typOdberatela'], { const: 'Zmena odberateľa' }]]),
         [
+          input(
+            'icoPovodnehoOdberatela',
+            { type: 'text', title: 'IČO pôvodného odberateľa', required: true },
+            {},
+          ),
+          input('noveIco', { type: 'text', title: 'Nové IČO', required: true }, {}),
           input(
             'dicNovehoOdberatela',
             { type: 'text', title: 'DIČ nového odberateľa', required: true },
             {},
           ),
+          datePicker(
+            'datumZmeny',
+            { title: 'Dátum zmeny', required: true },
+            { helptextHeader: 'Uveďte dátum predpokladanej zmeny odberateľa' },
+          ),
         ],
         [input('dic', { type: 'text', title: 'DIČ', required: true }, {})],
       ),
@@ -121,47 +164,26 @@ export default schema(
         { type: 'text', title: 'Meno kontaktnej osoby', required: true },
         {},
       ),
-      sharedPhoneNumberField('telefon', true),
-      input('email', { title: 'Email', required: true, type: 'email' }, {}),
-      object('fakturacia', { required: true }, { objectDisplay: 'boxed', title: 'Fakturácia' }, [
-        conditionalFields(
-          createCondition([
-            [
-              ['typOdberatela'],
-              {
-                enum: ['Zmena odberateľa'],
-              },
-            ],
-          ]),
-          [
-            input(
-              'ibanNovehoOdberatela',
-              { type: 'ba-iban', title: 'Nový IBAN', required: true },
-              {},
-            ),
-          ],
-          [input('iban', { type: 'ba-iban', title: 'IBAN', required: true }, {})],
-        ),
-        checkbox(
-          'elektronickaFaktura',
-          {
-            title: 'Súhlasím so zaslaním elektronickej faktúry',
-          },
-          {
-            helptextHeader:
-              'V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.',
-            checkboxLabel: 'Súhlasím so zaslaním elektronickej faktúry',
-            variant: 'boxed',
-          },
-        ),
-        conditionalFields(createCondition([[['elektronickaFaktura'], { const: true }]]), [
+      conditionalFields(
+        createCondition([[['typOdberatela'], { const: 'Zmena odberateľa' }]]),
+        [
           input(
-            'emailPreFaktury',
-            { type: 'text', title: 'E-mail pre zasielanie elektronických faktúr', required: true },
-            {},
+            'noveTelefonneCislo',
+            { type: 'ba-phone-number', title: 'Nové telefónne číslo', required: true },
+            { size: 'medium', placeholder: '+421' },
           ),
-        ]),
-      ]),
+          input('novyEmail', { title: 'Nový email', required: true, type: 'email' }, {}),
+        ],
+        [
+          sharedPhoneNumberField('telefon', true),
+          input('email', { title: 'Email', required: true, type: 'email' }, {}),
+        ],
+      ),
+      conditionalFields(
+        createCondition([[['typOdberatela'], { enum: ['Zmena odberateľa'] }]]),
+        [getFakturacia(true)],
+        [getFakturacia(false)],
+      ),
       conditionalFields(createCondition([[['typOdberatela'], { enum: ['Zmena odberateľa'] }]]), [
         radioGroup(
           'zmenyVPocteNadob',
@@ -191,7 +213,7 @@ export default schema(
           input(
             'miestoDodania',
             { type: 'text', title: 'Miesto dodania / výkonu služby', required: true },
-            { helptextHeader: 'Presná adresa' },
+            { helptextHeader: 'Vyplňte vo formáte ulica a číslo' },
           ),
           select(
             'druhOdpadu',
diff --git a/forms-shared/tests/definitions/__snapshots__/formDefinitions.ts.snap b/forms-shared/tests/definitions/__snapshots__/formDefinitions.ts.snap
index e62f8d3ae..84f7fc8ac 100644
--- a/forms-shared/tests/definitions/__snapshots__/formDefinitions.ts.snap
+++ b/forms-shared/tests/definitions/__snapshots__/formDefinitions.ts.snap
@@ -1166,11 +1166,11 @@ exports[`Form definitions olo-docistenie-stanovista-zbernych-nadob schemas match
                 "then": {
                   "properties": {
                     "konatel": {
-                      "title": "Konateľ (meno, priezvisko)",
+                      "title": "Konateľ",
                       "type": "string",
                     },
                     "zastupeny": {
-                      "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                      "title": "Zastúpený - na základe splnomocnenia",
                       "type": "string",
                     },
                   },
@@ -1335,7 +1335,6 @@ exports[`Form definitions olo-docistenie-stanovista-zbernych-nadob schemas match
               "miestoDodania",
               "komodita",
               "preferovanyDatum",
-              "doplnujuceInfo",
             ],
             "title": "Služba",
             "type": "object",
@@ -1616,6 +1615,7 @@ exports[`Form definitions olo-docistenie-stanovista-zbernych-nadob schemas match
       "konatel": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko konateľa",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -1697,6 +1697,7 @@ exports[`Form definitions olo-docistenie-stanovista-zbernych-nadob schemas match
       "zastupeny": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -1768,9 +1769,6 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo default form
     "vyrobneZarze": [],
   },
   "ziadatel": {
-    "fakturacia": {
-      "sposobPlatby": "Platba kartou",
-    },
     "vyberSluzby": "Mechanická vykládka a zhodnotenie odpadu podľa integrovaného povolenia",
     "ziadatelTyp": "Fyzická osoba",
   },
@@ -1969,7 +1967,7 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo schemas matc
                       "type": "string",
                     },
                     "konatel": {
-                      "title": "Konateľ (meno, priezvisko)",
+                      "title": "Konateľ",
                       "type": "string",
                     },
                     "kontaktnaOsoba": {
@@ -1985,7 +1983,7 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo schemas matc
                       "type": "boolean",
                     },
                     "zastupeny": {
-                      "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                      "title": "Zastúpený - na základe splnomocnenia",
                       "type": "string",
                     },
                   },
@@ -2035,117 +2033,119 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo schemas matc
                   "type": "object",
                 },
               },
-            ],
-            "properties": {
-              "email": {
-                "format": "email",
-                "title": "E-mail",
-                "type": "string",
-              },
-              "fakturacia": {
-                "allOf": [
-                  {
-                    "if": {
-                      "properties": {
-                        "sposobPlatby": {
-                          "const": "Platba na faktúru",
-                        },
-                      },
-                      "required": [
-                        "sposobPlatby",
+              {
+                "if": {
+                  "properties": {
+                    "ziadatelTyp": {
+                      "enum": [
+                        "Právnická osoba",
+                        "Právnická osoba s povolením na vstup do ZEVO",
                       ],
-                      "type": "object",
                     },
-                    "then": {
+                  },
+                  "required": [
+                    "ziadatelTyp",
+                  ],
+                  "type": "object",
+                },
+                "then": {
+                  "properties": {
+                    "fakturacia": {
                       "allOf": [
                         {
                           "if": {
                             "properties": {
-                              "elektronickaFaktura": {
-                                "const": true,
+                              "sposobPlatby": {
+                                "const": "Platba na faktúru",
                               },
                             },
                             "required": [
-                              "elektronickaFaktura",
+                              "sposobPlatby",
                             ],
                             "type": "object",
                           },
                           "then": {
+                            "allOf": [
+                              {
+                                "if": {
+                                  "properties": {
+                                    "elektronickaFaktura": {
+                                      "const": true,
+                                    },
+                                  },
+                                  "required": [
+                                    "elektronickaFaktura",
+                                  ],
+                                  "type": "object",
+                                },
+                                "then": {
+                                  "properties": {
+                                    "emailPreFaktury": {
+                                      "format": "email",
+                                      "title": "E-mail pre zasielanie elektronických faktúr",
+                                      "type": "string",
+                                    },
+                                  },
+                                  "required": [
+                                    "emailPreFaktury",
+                                  ],
+                                  "type": "object",
+                                },
+                              },
+                            ],
                             "properties": {
-                              "emailPreFaktury": {
-                                "format": "email",
-                                "title": "E-mail pre zasielanie elektronických faktúr",
+                              "elektronickaFaktura": {
+                                "title": "Súhlasím so zaslaním elektronickej faktúry",
+                                "type": "boolean",
+                              },
+                              "iban": {
+                                "format": "ba-iban",
+                                "title": "IBAN",
                                 "type": "string",
                               },
                             },
                             "required": [
-                              "emailPreFaktury",
+                              "iban",
                             ],
                             "type": "object",
                           },
                         },
                       ],
                       "properties": {
-                        "elektronickaFaktura": {
-                          "title": "Súhlasím so zaslaním elektronickej faktúry",
-                          "type": "boolean",
-                        },
-                      },
-                      "required": [],
-                      "type": "object",
-                    },
-                  },
-                  {
-                    "if": {
-                      "properties": {
-                        "ziadatelTyp": {
-                          "enum": [
-                            "Právnická osoba",
-                            "Právnická osoba s povolením na vstup do ZEVO",
+                        "sposobPlatby": {
+                          "default": "Platba kartou",
+                          "oneOf": [
+                            {
+                              "const": "Platba kartou",
+                              "title": "Platba kartou",
+                            },
+                            {
+                              "const": "Platba na faktúru",
+                              "title": "Platba na faktúru",
+                            },
                           ],
-                        },
-                      },
-                      "required": [
-                        "ziadatelTyp",
-                      ],
-                      "type": "object",
-                    },
-                    "then": {
-                      "properties": {
-                        "iban": {
-                          "format": "ba-iban",
-                          "title": "IBAN",
+                          "title": "Spôsob platby",
                           "type": "string",
                         },
                       },
                       "required": [
-                        "iban",
+                        "sposobPlatby",
                       ],
                       "type": "object",
                     },
                   },
-                ],
-                "properties": {
-                  "sposobPlatby": {
-                    "default": "Platba kartou",
-                    "oneOf": [
-                      {
-                        "const": "Platba kartou",
-                        "title": "Platba kartou",
-                      },
-                      {
-                        "const": "Platba na faktúru",
-                        "title": "Platba na faktúru",
-                      },
-                    ],
-                    "title": "Spôsob platby",
-                    "type": "string",
-                  },
+                  "required": [
+                    "fakturacia",
+                  ],
+                  "type": "object",
                 },
-                "required": [
-                  "sposobPlatby",
-                ],
-                "type": "object",
+              },
+            ],
+            "properties": {
+              "email": {
+                "format": "email",
+                "title": "E-mail",
+                "type": "string",
               },
               "preferovanyDatumDovozu": {
                 "format": "date",
@@ -2202,7 +2202,6 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo schemas matc
               "email",
               "vyberSluzby",
               "preferovanyDatumDovozu",
-              "fakturacia",
             ],
             "title": "Žiadateľ",
             "type": "object",
@@ -4380,9 +4379,9 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo schemas matc
         },
         "ui:order": [
           "sposobPlatby",
+          "iban",
           "elektronickaFaktura",
           "emailPreFaktury",
-          "iban",
         ],
       },
       "icDph": {
@@ -4402,6 +4401,7 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo schemas matc
       "konatel": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko konateľa",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -4519,6 +4519,7 @@ exports[`Form definitions olo-energeticke-zhodnotenie-odpadu-v-zevo schemas matc
       "zastupeny": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -4706,7 +4707,7 @@ exports[`Form definitions olo-kolo-taxi schemas match snapshot 1`] = `
                       "type": "string",
                     },
                     "konatel": {
-                      "title": "Konateľ (meno, priezvisko)",
+                      "title": "Konateľ",
                       "type": "string",
                     },
                     "menoKontaktnejOsoby": {
@@ -4722,7 +4723,7 @@ exports[`Form definitions olo-kolo-taxi schemas match snapshot 1`] = `
                       "type": "boolean",
                     },
                     "zastupeny": {
-                      "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                      "title": "Zastúpený - na základe splnomocnenia",
                       "type": "string",
                     },
                   },
@@ -5082,6 +5083,7 @@ exports[`Form definitions olo-kolo-taxi schemas match snapshot 1`] = `
       "konatel": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko konateľa",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -5163,6 +5165,7 @@ exports[`Form definitions olo-kolo-taxi schemas match snapshot 1`] = `
       "zastupeny": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -5390,11 +5393,11 @@ exports[`Form definitions olo-mimoriadny-odvoz-a-zhodnotenie-odpadu schemas matc
                 "then": {
                   "properties": {
                     "konatel": {
-                      "title": "Konateľ (meno, priezvisko)",
+                      "title": "Konateľ",
                       "type": "string",
                     },
                     "zastupeny": {
-                      "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                      "title": "Zastúpený - na základe splnomocnenia",
                       "type": "string",
                     },
                   },
@@ -6254,6 +6257,7 @@ exports[`Form definitions olo-mimoriadny-odvoz-a-zhodnotenie-odpadu schemas matc
       "konatel": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko konateľa",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -6335,6 +6339,7 @@ exports[`Form definitions olo-mimoriadny-odvoz-a-zhodnotenie-odpadu schemas matc
       "zastupeny": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -6414,11 +6419,11 @@ exports[`Form definitions olo-odvoz-objemneho-odpadu-valnikom schemas match snap
                 "then": {
                   "properties": {
                     "konatel": {
-                      "title": "Konateľ (meno, priezvisko)",
+                      "title": "Konateľ",
                       "type": "string",
                     },
                     "zastupeny": {
-                      "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                      "title": "Zastúpený - na základe splnomocnenia",
                       "type": "string",
                     },
                   },
@@ -7075,11 +7080,11 @@ exports[`Form definitions olo-odvoz-odpadu-velkokapacitnym-alebo-lisovacim-konta
                 "then": {
                   "properties": {
                     "konatel": {
-                      "title": "Konateľ (meno, priezvisko)",
+                      "title": "Konateľ",
                       "type": "string",
                     },
                     "zastupeny": {
-                      "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                      "title": "Zastúpený - na základe splnomocnenia",
                       "type": "string",
                     },
                   },
@@ -7384,7 +7389,7 @@ exports[`Form definitions olo-odvoz-odpadu-velkokapacitnym-alebo-lisovacim-konta
       "miestoDodania": {
         "ui:label": false,
         "ui:options": {
-          "helptextHeader": "Presná adresa",
+          "helptextHeader": "Vyplňte vo formáte ulica a číslo",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -7617,6 +7622,7 @@ exports[`Form definitions olo-odvoz-odpadu-velkokapacitnym-alebo-lisovacim-konta
       "konatel": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko konateľa",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -7698,6 +7704,7 @@ exports[`Form definitions olo-odvoz-odpadu-velkokapacitnym-alebo-lisovacim-konta
       "zastupeny": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -7836,7 +7843,12 @@ exports[`Form definitions olo-olo-taxi schemas match snapshot 1`] = `
                 "type": "string",
               },
               "preferovanyCasOdvozu": {
-                "format": "ba-time",
+                "enum": [
+                  "07:00 (pondelok - sobota)",
+                  "09:00 (pondelok - sobota)",
+                  "11:00 (pondelok - sobota)",
+                  "13:00 (pondelok - piatok)",
+                ],
                 "title": "Preferovaný čas odvozu",
                 "type": "string",
               },
@@ -7845,7 +7857,7 @@ exports[`Form definitions olo-olo-taxi schemas match snapshot 1`] = `
                 "title": "Preferovaný dátum odvozu",
                 "type": "string",
               },
-              "suhlasSDarom": {
+              "suhlasSPlatbou": {
                 "const": true,
                 "title": "Vyjadrenie súhlasu s platbou",
                 "type": "boolean",
@@ -7856,7 +7868,7 @@ exports[`Form definitions olo-olo-taxi schemas match snapshot 1`] = `
               "preferovanyDatumOdvozu",
               "preferovanyCasOdvozu",
               "mnozstvoADruhOdpadu",
-              "suhlasSDarom",
+              "suhlasSPlatbou",
             ],
             "title": "Služba",
             "type": "object",
@@ -7917,9 +7929,22 @@ exports[`Form definitions olo-olo-taxi schemas match snapshot 1`] = `
       },
       "preferovanyCasOdvozu": {
         "ui:options": {
-          "helptextHeader": "7:00  (Pon - Sob); 9:00 (Pon - Sob); 11:00 (Pon - Sob); 13:00 (Pon - Pia)",
+          "selectOptions": {
+            "07:00 (pondelok - sobota)": {
+              "title": "07:00 (pondelok - sobota)",
+            },
+            "09:00 (pondelok - sobota)": {
+              "title": "09:00 (pondelok - sobota)",
+            },
+            "11:00 (pondelok - sobota)": {
+              "title": "11:00 (pondelok - sobota)",
+            },
+            "13:00 (pondelok - piatok)": {
+              "title": "13:00 (pondelok - piatok)",
+            },
+          },
         },
-        "ui:widget": "TimePicker",
+        "ui:widget": "Select",
       },
       "preferovanyDatumOdvozu": {
         "ui:options": {
@@ -7927,7 +7952,7 @@ exports[`Form definitions olo-olo-taxi schemas match snapshot 1`] = `
         },
         "ui:widget": "DatePicker",
       },
-      "suhlasSDarom": {
+      "suhlasSPlatbou": {
         "ui:options": {
           "checkboxLabel": "Súhlasím s platbou za službu OLO Taxi",
           "variant": "boxed",
@@ -7942,7 +7967,7 @@ exports[`Form definitions olo-olo-taxi schemas match snapshot 1`] = `
         "preferovanyDatumOdvozu",
         "preferovanyCasOdvozu",
         "mnozstvoADruhOdpadu",
-        "suhlasSDarom",
+        "suhlasSPlatbou",
       ],
     },
     "suhlasy": {
@@ -8291,6 +8316,7 @@ exports[`Form definitions olo-podnety-a-pochvaly-obcanov schemas match snapshot
       "adresaMiestaOdvozu": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Vyplňte vo formáte ulica a číslo",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -8447,23 +8473,12 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                 },
               },
               {
-                "if": {
+                "else": {
                   "properties": {
-                    "typOdberatela": {
-                      "enum": [
-                        "Nový",
-                        "Existujúci",
-                        "Zmena poplatkovej povinnosti pre existujúceho zákazníka",
-                      ],
+                    "dic": {
+                      "title": "DIČ",
+                      "type": "string",
                     },
-                  },
-                  "required": [
-                    "typOdberatela",
-                  ],
-                  "type": "object",
-                },
-                "then": {
-                  "properties": {
                     "ico": {
                       "title": "IČO",
                       "type": "string",
@@ -8471,11 +8486,10 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                   },
                   "required": [
                     "ico",
+                    "dic",
                   ],
                   "type": "object",
                 },
-              },
-              {
                 "if": {
                   "properties": {
                     "typOdberatela": {
@@ -8494,7 +8508,11 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                       "title": "Dátum zmeny",
                       "type": "string",
                     },
-                    "icoPovodnehOdberatela": {
+                    "dicNovehoOdberatela": {
+                      "title": "DIČ nového odberateľa",
+                      "type": "string",
+                    },
+                    "icoPovodnehoOdberatela": {
                       "title": "IČO pôvodného odberateľa",
                       "type": "string",
                     },
@@ -8504,85 +8522,63 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                     },
                   },
                   "required": [
-                    "icoPovodnehOdberatela",
+                    "icoPovodnehoOdberatela",
                     "noveIco",
+                    "dicNovehoOdberatela",
                     "datumZmeny",
                   ],
                   "type": "object",
                 },
               },
               {
-                "else": {
-                  "properties": {
-                    "dic": {
-                      "title": "DIČ",
-                      "type": "string",
-                    },
-                  },
-                  "required": [
-                    "dic",
-                  ],
-                  "type": "object",
-                },
                 "if": {
                   "properties": {
-                    "typOdberatela": {
-                      "enum": [
-                        "Zmena odberateľa",
-                      ],
+                    "platcaDph": {
+                      "const": true,
                     },
                   },
                   "required": [
-                    "typOdberatela",
+                    "platcaDph",
                   ],
                   "type": "object",
                 },
                 "then": {
                   "properties": {
-                    "dicNovehoOdberatela": {
-                      "title": "DIČ nového odberateľa",
+                    "icDph": {
+                      "title": "IČ DPH",
                       "type": "string",
                     },
                   },
                   "required": [
-                    "dicNovehoOdberatela",
+                    "icDph",
                   ],
                   "type": "object",
                 },
               },
               {
-                "if": {
+                "else": {
                   "properties": {
-                    "platcaDph": {
-                      "const": true,
+                    "email": {
+                      "format": "email",
+                      "title": "Email",
+                      "type": "string",
                     },
-                  },
-                  "required": [
-                    "platcaDph",
-                  ],
-                  "type": "object",
-                },
-                "then": {
-                  "properties": {
-                    "icDph": {
-                      "title": "IČ DPH",
+                    "telefon": {
+                      "format": "ba-phone-number",
+                      "title": "Telefónne číslo",
                       "type": "string",
                     },
                   },
                   "required": [
-                    "icDph",
+                    "telefon",
+                    "email",
                   ],
                   "type": "object",
                 },
-              },
-              {
                 "if": {
                   "properties": {
                     "typOdberatela": {
-                      "enum": [
-                        "Zmena poplatkovej povinnosti pre existujúceho zákazníka",
-                        "Zmena odberateľa",
-                      ],
+                      "const": "Zmena odberateľa",
                     },
                   },
                   "required": [
@@ -8592,23 +8588,177 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                 },
                 "then": {
                   "properties": {
-                    "zmenyVPocteNadob": {
-                      "oneOf": [
-                        {
-                          "const": true,
-                          "title": "Áno",
-                        },
-                        {
-                          "const": false,
-                          "title": "Nie",
-                        },
-                      ],
-                      "title": "Chcem vykonať zmeny v počte nádob alebo ohľadom frekvencie odvozu",
-                      "type": "boolean",
+                    "noveTelefonneCislo": {
+                      "format": "ba-phone-number",
+                      "title": "Nové telefónne číslo",
+                      "type": "string",
+                    },
+                    "novyEmail": {
+                      "format": "email",
+                      "title": "Nový email",
+                      "type": "string",
                     },
                   },
                   "required": [
-                    "zmenyVPocteNadob",
+                    "noveTelefonneCislo",
+                    "novyEmail",
+                  ],
+                  "type": "object",
+                },
+              },
+              {
+                "else": {
+                  "properties": {
+                    "fakturacia": {
+                      "allOf": [
+                        {
+                          "if": {
+                            "properties": {
+                              "elektronickaFaktura": {
+                                "const": true,
+                              },
+                            },
+                            "required": [
+                              "elektronickaFaktura",
+                            ],
+                            "type": "object",
+                          },
+                          "then": {
+                            "properties": {
+                              "emailPreFaktury": {
+                                "title": "E-mail pre zasielanie elektronických faktúr",
+                                "type": "string",
+                              },
+                            },
+                            "required": [
+                              "emailPreFaktury",
+                            ],
+                            "type": "object",
+                          },
+                        },
+                      ],
+                      "properties": {
+                        "elektronickaFaktura": {
+                          "title": "Súhlasím so zaslaním elektronickej faktúry",
+                          "type": "boolean",
+                        },
+                        "iban": {
+                          "format": "ba-iban",
+                          "title": "IBAN",
+                          "type": "string",
+                        },
+                      },
+                      "required": [
+                        "iban",
+                      ],
+                      "type": "object",
+                    },
+                  },
+                  "required": [
+                    "fakturacia",
+                  ],
+                  "type": "object",
+                },
+                "if": {
+                  "properties": {
+                    "typOdberatela": {
+                      "enum": [
+                        "Zmena odberateľa",
+                      ],
+                    },
+                  },
+                  "required": [
+                    "typOdberatela",
+                  ],
+                  "type": "object",
+                },
+                "then": {
+                  "properties": {
+                    "fakturaciaNovehoOdoberatela": {
+                      "allOf": [
+                        {
+                          "if": {
+                            "properties": {
+                              "elektronickaFaktura": {
+                                "const": true,
+                              },
+                            },
+                            "required": [
+                              "elektronickaFaktura",
+                            ],
+                            "type": "object",
+                          },
+                          "then": {
+                            "properties": {
+                              "emailPreFaktury": {
+                                "title": "E-mail pre zasielanie elektronických faktúr",
+                                "type": "string",
+                              },
+                            },
+                            "required": [
+                              "emailPreFaktury",
+                            ],
+                            "type": "object",
+                          },
+                        },
+                      ],
+                      "properties": {
+                        "elektronickaFaktura": {
+                          "title": "Súhlasím so zaslaním elektronickej faktúry",
+                          "type": "boolean",
+                        },
+                        "iban": {
+                          "format": "ba-iban",
+                          "title": "Nový IBAN",
+                          "type": "string",
+                        },
+                      },
+                      "required": [
+                        "iban",
+                      ],
+                      "type": "object",
+                    },
+                  },
+                  "required": [
+                    "fakturaciaNovehoOdoberatela",
+                  ],
+                  "type": "object",
+                },
+              },
+              {
+                "if": {
+                  "properties": {
+                    "typOdberatela": {
+                      "enum": [
+                        "Zmena poplatkovej povinnosti pre existujúceho zákazníka",
+                        "Zmena odberateľa",
+                      ],
+                    },
+                  },
+                  "required": [
+                    "typOdberatela",
+                  ],
+                  "type": "object",
+                },
+                "then": {
+                  "properties": {
+                    "zmenyVPocteNadob": {
+                      "oneOf": [
+                        {
+                          "const": true,
+                          "title": "Áno",
+                        },
+                        {
+                          "const": false,
+                          "title": "Nie",
+                        },
+                      ],
+                      "title": "Chcem vykonať zmeny v počte nádob alebo ohľadom frekvencie odvozu",
+                      "type": "boolean",
+                    },
+                  },
+                  "required": [
+                    "zmenyVPocteNadob",
                   ],
                   "type": "object",
                 },
@@ -8646,57 +8796,8 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                 ],
                 "type": "object",
               },
-              "email": {
-                "format": "email",
-                "title": "Email",
-                "type": "string",
-              },
-              "fakturacia": {
-                "allOf": [
-                  {
-                    "if": {
-                      "properties": {
-                        "elektronickaFaktura": {
-                          "const": true,
-                        },
-                      },
-                      "required": [
-                        "elektronickaFaktura",
-                      ],
-                      "type": "object",
-                    },
-                    "then": {
-                      "properties": {
-                        "emailPreFaktury": {
-                          "title": "E-mail pre zasielanie elektronických faktúr",
-                          "type": "string",
-                        },
-                      },
-                      "required": [
-                        "emailPreFaktury",
-                      ],
-                      "type": "object",
-                    },
-                  },
-                ],
-                "properties": {
-                  "elektronickaFaktura": {
-                    "title": "Súhlasím so zaslaním elektronickej faktúry",
-                    "type": "boolean",
-                  },
-                  "iban": {
-                    "format": "ba-iban",
-                    "title": "IBAN",
-                    "type": "string",
-                  },
-                },
-                "required": [
-                  "iban",
-                ],
-                "type": "object",
-              },
               "konatel": {
-                "title": "Konateľ (meno, priezvisko)",
+                "title": "Konateľ",
                 "type": "string",
               },
               "menoKontaktnejOsoby": {
@@ -8711,11 +8812,6 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                 "title": "Som platca DPH?",
                 "type": "boolean",
               },
-              "telefon": {
-                "format": "ba-phone-number",
-                "title": "Telefónne číslo",
-                "type": "string",
-              },
               "typOdberatela": {
                 "default": "Nový",
                 "oneOf": [
@@ -8740,7 +8836,7 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
                 "type": "string",
               },
               "zastupeny": {
-                "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                "title": "Zastúpený - na základe splnomocnenia",
                 "type": "string",
               },
             },
@@ -8751,9 +8847,6 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
               "konatel",
               "zastupeny",
               "menoKontaktnejOsoby",
-              "telefon",
-              "email",
-              "fakturacia",
             ],
             "title": "Žiadateľ",
             "type": "object",
@@ -9188,7 +9281,7 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
           "miestoDodania": {
             "ui:label": false,
             "ui:options": {
-              "helptextHeader": "Presná adresa",
+              "helptextHeader": "Vyplňte vo formáte ulica a číslo",
               "inputType": "text",
             },
             "ui:widget": "Input",
@@ -9455,6 +9548,39 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
           "emailPreFaktury",
         ],
       },
+      "fakturaciaNovehoOdoberatela": {
+        "elektronickaFaktura": {
+          "ui:options": {
+            "checkboxLabel": "Súhlasím so zaslaním elektronickej faktúry",
+            "helptextHeader": "V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.",
+            "variant": "boxed",
+          },
+          "ui:widget": "Checkbox",
+        },
+        "emailPreFaktury": {
+          "ui:label": false,
+          "ui:options": {
+            "inputType": "text",
+          },
+          "ui:widget": "Input",
+        },
+        "iban": {
+          "ui:label": false,
+          "ui:options": {
+            "inputType": "text",
+          },
+          "ui:widget": "Input",
+        },
+        "ui:options": {
+          "objectDisplay": "boxed",
+          "title": "Fakturácia",
+        },
+        "ui:order": [
+          "iban",
+          "elektronickaFaktura",
+          "emailPreFaktury",
+        ],
+      },
       "icDph": {
         "ui:label": false,
         "ui:options": {
@@ -9469,7 +9595,7 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
         },
         "ui:widget": "Input",
       },
-      "icoPovodnehOdberatela": {
+      "icoPovodnehoOdberatela": {
         "ui:label": false,
         "ui:options": {
           "inputType": "text",
@@ -9479,6 +9605,7 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
       "konatel": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko konateľa",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -9504,6 +9631,22 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
         },
         "ui:widget": "Input",
       },
+      "noveTelefonneCislo": {
+        "ui:label": false,
+        "ui:options": {
+          "inputType": "tel",
+          "placeholder": "+421",
+          "size": "medium",
+        },
+        "ui:widget": "Input",
+      },
+      "novyEmail": {
+        "ui:label": false,
+        "ui:options": {
+          "inputType": "email",
+        },
+        "ui:widget": "Input",
+      },
       "platcaDph": {
         "ui:options": {
           "checkboxLabel": "Som platca DPH",
@@ -9522,9 +9665,25 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
       },
       "typOdberatela": {
         "ui:options": {
-          "helptextHeader": "Nový (nemám uzavretú zmluvu), Existujúci (mám uzavretú zmluvu), Zmena poplatkovej povinnosti (spoplatnenie služby), Zmena odberateľa (napr. preberám prevádzku alebo správu nehnuteľnosti)",
           "orientations": "column",
-          "radioOptions": [],
+          "radioOptions": [
+            {
+              "description": "Nemám uzavretú zmluvu",
+              "value": "Nový",
+            },
+            {
+              "description": "Mám uzavretú zmluvu",
+              "value": "Existujúci",
+            },
+            {
+              "description": "Spoplatnenie služby",
+              "value": "Zmena poplatkovej povinnosti pre existujúceho zákazníka",
+            },
+            {
+              "description": "Napr. preberám prevádzku alebo správu nehnuteľnosti",
+              "value": "Zmena odberateľa",
+            },
+          ],
           "variant": "boxed",
         },
         "ui:widget": "RadioGroup",
@@ -9537,25 +9696,29 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke
         "nazovOrganizacie",
         "adresaSidla",
         "cisloZmluvy",
-        "ico",
-        "icoPovodnehOdberatela",
+        "icoPovodnehoOdberatela",
         "noveIco",
-        "datumZmeny",
         "dicNovehoOdberatela",
+        "datumZmeny",
+        "ico",
         "dic",
         "platcaDph",
         "icDph",
         "konatel",
         "zastupeny",
         "menoKontaktnejOsoby",
+        "noveTelefonneCislo",
+        "novyEmail",
         "telefon",
         "email",
+        "fakturaciaNovehoOdoberatela",
         "fakturacia",
         "zmenyVPocteNadob",
       ],
       "zastupeny": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -9763,6 +9926,18 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
                 },
               },
               {
+                "else": {
+                  "properties": {
+                    "dic": {
+                      "title": "DIČ",
+                      "type": "string",
+                    },
+                  },
+                  "required": [
+                    "dic",
+                  ],
+                  "type": "object",
+                },
                 "if": {
                   "properties": {
                     "typOdberatela": {
@@ -9781,7 +9956,11 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
                       "title": "Dátum zmeny",
                       "type": "string",
                     },
-                    "icoPovodnehOdberatela": {
+                    "dicNovehoOdberatela": {
+                      "title": "DIČ nového odberateľa",
+                      "type": "string",
+                    },
+                    "icoPovodnehoOdberatela": {
                       "title": "IČO pôvodného odberateľa",
                       "type": "string",
                     },
@@ -9791,84 +9970,63 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
                     },
                   },
                   "required": [
-                    "icoPovodnehOdberatela",
+                    "icoPovodnehoOdberatela",
                     "noveIco",
+                    "dicNovehoOdberatela",
                     "datumZmeny",
                   ],
                   "type": "object",
                 },
               },
               {
-                "else": {
-                  "properties": {
-                    "dic": {
-                      "title": "DIČ",
-                      "type": "string",
-                    },
-                  },
-                  "required": [
-                    "dic",
-                  ],
-                  "type": "object",
-                },
                 "if": {
                   "properties": {
-                    "typOdberatela": {
-                      "enum": [
-                        "Zmena odberateľa",
-                      ],
+                    "platcaDph": {
+                      "const": true,
                     },
                   },
                   "required": [
-                    "typOdberatela",
+                    "platcaDph",
                   ],
                   "type": "object",
                 },
                 "then": {
                   "properties": {
-                    "dicNovehoOdberatela": {
-                      "title": "DIČ nového odberateľa",
+                    "icDph": {
+                      "title": "IČ DPH",
                       "type": "string",
                     },
                   },
                   "required": [
-                    "dicNovehoOdberatela",
+                    "icDph",
                   ],
                   "type": "object",
                 },
               },
               {
-                "if": {
+                "else": {
                   "properties": {
-                    "platcaDph": {
-                      "const": true,
+                    "email": {
+                      "format": "email",
+                      "title": "Email",
+                      "type": "string",
                     },
-                  },
-                  "required": [
-                    "platcaDph",
-                  ],
-                  "type": "object",
-                },
-                "then": {
-                  "properties": {
-                    "icDph": {
-                      "title": "IČ DPH",
+                    "telefon": {
+                      "format": "ba-phone-number",
+                      "title": "Telefónne číslo",
                       "type": "string",
                     },
                   },
                   "required": [
-                    "icDph",
+                    "telefon",
+                    "email",
                   ],
                   "type": "object",
                 },
-              },
-              {
                 "if": {
                   "properties": {
                     "typOdberatela": {
-                      "enum": [
-                        "Zmena odberateľa",
-                      ],
+                      "const": "Zmena odberateľa",
                     },
                   },
                   "required": [
@@ -9878,39 +10036,60 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
                 },
                 "then": {
                   "properties": {
-                    "zmenyVPocteNadob": {
-                      "oneOf": [
-                        {
-                          "const": true,
-                          "title": "Áno",
-                        },
-                        {
-                          "const": false,
-                          "title": "Nie",
-                        },
-                      ],
-                      "title": "Chcem vykonať zmeny v počte nádob alebo ohľadom frekvencie odvozu",
-                      "type": "boolean",
+                    "noveTelefonneCislo": {
+                      "format": "ba-phone-number",
+                      "title": "Nové telefónne číslo",
+                      "type": "string",
+                    },
+                    "novyEmail": {
+                      "format": "email",
+                      "title": "Nový email",
+                      "type": "string",
                     },
                   },
                   "required": [
-                    "zmenyVPocteNadob",
+                    "noveTelefonneCislo",
+                    "novyEmail",
                   ],
                   "type": "object",
                 },
               },
-            ],
-            "properties": {
-              "email": {
-                "format": "email",
-                "title": "Email",
-                "type": "string",
-              },
-              "fakturacia": {
-                "allOf": [
-                  {
-                    "else": {
+              {
+                "else": {
+                  "properties": {
+                    "fakturacia": {
+                      "allOf": [
+                        {
+                          "if": {
+                            "properties": {
+                              "elektronickaFaktura": {
+                                "const": true,
+                              },
+                            },
+                            "required": [
+                              "elektronickaFaktura",
+                            ],
+                            "type": "object",
+                          },
+                          "then": {
+                            "properties": {
+                              "emailPreFaktury": {
+                                "title": "E-mail pre zasielanie elektronických faktúr",
+                                "type": "string",
+                              },
+                            },
+                            "required": [
+                              "emailPreFaktury",
+                            ],
+                            "type": "object",
+                          },
+                        },
+                      ],
                       "properties": {
+                        "elektronickaFaktura": {
+                          "title": "Súhlasím so zaslaním elektronickej faktúry",
+                          "type": "boolean",
+                        },
                         "iban": {
                           "format": "ba-iban",
                           "title": "IBAN",
@@ -9922,68 +10101,117 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
                       ],
                       "type": "object",
                     },
-                    "if": {
-                      "properties": {
-                        "typOdberatela": {
-                          "enum": [
-                            "Zmena odberateľa",
-                          ],
-                        },
-                      },
-                      "required": [
-                        "typOdberatela",
+                  },
+                  "required": [
+                    "fakturacia",
+                  ],
+                  "type": "object",
+                },
+                "if": {
+                  "properties": {
+                    "typOdberatela": {
+                      "enum": [
+                        "Zmena odberateľa",
                       ],
-                      "type": "object",
                     },
-                    "then": {
+                  },
+                  "required": [
+                    "typOdberatela",
+                  ],
+                  "type": "object",
+                },
+                "then": {
+                  "properties": {
+                    "fakturaciaNovehoOdoberatela": {
+                      "allOf": [
+                        {
+                          "if": {
+                            "properties": {
+                              "elektronickaFaktura": {
+                                "const": true,
+                              },
+                            },
+                            "required": [
+                              "elektronickaFaktura",
+                            ],
+                            "type": "object",
+                          },
+                          "then": {
+                            "properties": {
+                              "emailPreFaktury": {
+                                "title": "E-mail pre zasielanie elektronických faktúr",
+                                "type": "string",
+                              },
+                            },
+                            "required": [
+                              "emailPreFaktury",
+                            ],
+                            "type": "object",
+                          },
+                        },
+                      ],
                       "properties": {
-                        "ibanNovehoOdberatela": {
+                        "elektronickaFaktura": {
+                          "title": "Súhlasím so zaslaním elektronickej faktúry",
+                          "type": "boolean",
+                        },
+                        "iban": {
                           "format": "ba-iban",
                           "title": "Nový IBAN",
                           "type": "string",
                         },
                       },
                       "required": [
-                        "ibanNovehoOdberatela",
+                        "iban",
                       ],
                       "type": "object",
                     },
                   },
-                  {
-                    "if": {
-                      "properties": {
-                        "elektronickaFaktura": {
-                          "const": true,
-                        },
-                      },
-                      "required": [
-                        "elektronickaFaktura",
+                  "required": [
+                    "fakturaciaNovehoOdoberatela",
+                  ],
+                  "type": "object",
+                },
+              },
+              {
+                "if": {
+                  "properties": {
+                    "typOdberatela": {
+                      "enum": [
+                        "Zmena odberateľa",
                       ],
-                      "type": "object",
                     },
-                    "then": {
-                      "properties": {
-                        "emailPreFaktury": {
-                          "title": "E-mail pre zasielanie elektronických faktúr",
-                          "type": "string",
+                  },
+                  "required": [
+                    "typOdberatela",
+                  ],
+                  "type": "object",
+                },
+                "then": {
+                  "properties": {
+                    "zmenyVPocteNadob": {
+                      "oneOf": [
+                        {
+                          "const": true,
+                          "title": "Áno",
+                        },
+                        {
+                          "const": false,
+                          "title": "Nie",
                         },
-                      },
-                      "required": [
-                        "emailPreFaktury",
                       ],
-                      "type": "object",
+                      "title": "Chcem vykonať zmeny v počte nádob alebo ohľadom frekvencie odvozu",
+                      "type": "boolean",
                     },
                   },
-                ],
-                "properties": {
-                  "elektronickaFaktura": {
-                    "title": "Súhlasím so zaslaním elektronickej faktúry",
-                    "type": "boolean",
-                  },
+                  "required": [
+                    "zmenyVPocteNadob",
+                  ],
+                  "type": "object",
                 },
-                "required": [],
-                "type": "object",
               },
+            ],
+            "properties": {
               "menoKontaktnejOsoby": {
                 "title": "Meno kontaktnej osoby",
                 "type": "string",
@@ -9992,11 +10220,6 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
                 "title": "Som platca DPH?",
                 "type": "boolean",
               },
-              "telefon": {
-                "format": "ba-phone-number",
-                "title": "Telefónne číslo",
-                "type": "string",
-              },
               "typOdberatela": {
                 "default": "Nový",
                 "oneOf": [
@@ -10020,9 +10243,6 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
             "required": [
               "typOdberatela",
               "menoKontaktnejOsoby",
-              "telefon",
-              "email",
-              "fakturacia",
             ],
             "title": "Žiadateľ",
             "type": "object",
@@ -10325,7 +10545,7 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
           "miestoDodania": {
             "ui:label": false,
             "ui:options": {
-              "helptextHeader": "Presná adresa",
+              "helptextHeader": "Vyplňte vo formáte ulica a číslo",
               "inputType": "text",
             },
             "ui:widget": "Input",
@@ -10539,7 +10759,33 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
           },
           "ui:widget": "Input",
         },
-        "ibanNovehoOdberatela": {
+        "ui:options": {
+          "objectDisplay": "boxed",
+          "title": "Fakturácia",
+        },
+        "ui:order": [
+          "iban",
+          "elektronickaFaktura",
+          "emailPreFaktury",
+        ],
+      },
+      "fakturaciaNovehoOdoberatela": {
+        "elektronickaFaktura": {
+          "ui:options": {
+            "checkboxLabel": "Súhlasím so zaslaním elektronickej faktúry",
+            "helptextHeader": "V prípade vyjadrenia nesúhlasu bude zákazníkovi za zasielanie faktúry poštou účtovaný poplatok 10 € bez DPH. Osobitné ustanovenia o zasielaní faktúry v elektronickej podobe v zmysle bodu 5.9 VOP.",
+            "variant": "boxed",
+          },
+          "ui:widget": "Checkbox",
+        },
+        "emailPreFaktury": {
+          "ui:label": false,
+          "ui:options": {
+            "inputType": "text",
+          },
+          "ui:widget": "Input",
+        },
+        "iban": {
           "ui:label": false,
           "ui:options": {
             "inputType": "text",
@@ -10551,7 +10797,6 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
           "title": "Fakturácia",
         },
         "ui:order": [
-          "ibanNovehoOdberatela",
           "iban",
           "elektronickaFaktura",
           "emailPreFaktury",
@@ -10571,7 +10816,7 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
         },
         "ui:widget": "Input",
       },
-      "icoPovodnehOdberatela": {
+      "icoPovodnehoOdberatela": {
         "ui:label": false,
         "ui:options": {
           "inputType": "text",
@@ -10654,6 +10899,22 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
         },
         "ui:widget": "Input",
       },
+      "noveTelefonneCislo": {
+        "ui:label": false,
+        "ui:options": {
+          "inputType": "tel",
+          "placeholder": "+421",
+          "size": "medium",
+        },
+        "ui:widget": "Input",
+      },
+      "novyEmail": {
+        "ui:label": false,
+        "ui:options": {
+          "inputType": "email",
+        },
+        "ui:widget": "Input",
+      },
       "platcaDph": {
         "ui:options": {
           "checkboxLabel": "Som platca DPH",
@@ -10672,9 +10933,21 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
       },
       "typOdberatela": {
         "ui:options": {
-          "helptextHeader": "Nový (nemám uzavretú zmluvu), Existujúci (mám uzavretú zmluvu), Zmena odberateľa (napr. preberám prevádzku alebo správu nehnuteľnosti)",
           "orientations": "column",
-          "radioOptions": [],
+          "radioOptions": [
+            {
+              "description": "Nemám uzavretú zmluvu",
+              "value": "Nový",
+            },
+            {
+              "description": "Mám uzavretú zmluvu",
+              "value": "Existujúci",
+            },
+            {
+              "description": "Napr. preberám prevádzku alebo správu nehnuteľnosti",
+              "value": "Zmena odberateľa",
+            },
+          ],
           "variant": "boxed",
         },
         "ui:widget": "RadioGroup",
@@ -10691,16 +10964,19 @@ exports[`Form definitions olo-triedeny-zber-papiera-plastov-a-skla-pre-spravcovs
         "adresaSidla",
         "cisloZmluvy",
         "ico",
-        "icoPovodnehOdberatela",
+        "icoPovodnehoOdberatela",
         "noveIco",
-        "datumZmeny",
         "dicNovehoOdberatela",
+        "datumZmeny",
         "dic",
         "platcaDph",
         "icDph",
         "menoKontaktnejOsoby",
+        "noveTelefonneCislo",
+        "novyEmail",
         "telefon",
         "email",
+        "fakturaciaNovehoOdoberatela",
         "fakturacia",
         "zmenyVPocteNadob",
       ],
@@ -10763,9 +11039,6 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom default f
     "vyrobneZarze": [],
   },
   "ziadatel": {
-    "fakturacia": {
-      "sposobPlatby": "Platba kartou",
-    },
     "ziadatelTyp": "Fyzická osoba",
   },
 }
@@ -10963,7 +11236,7 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom schemas m
                       "type": "string",
                     },
                     "konatel": {
-                      "title": "Konateľ (meno, priezvisko)",
+                      "title": "Konateľ",
                       "type": "string",
                     },
                     "kontaktnaOsoba": {
@@ -10979,7 +11252,7 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom schemas m
                       "type": "boolean",
                     },
                     "zastupeny": {
-                      "title": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+                      "title": "Zastúpený - na základe splnomocnenia",
                       "type": "string",
                     },
                   },
@@ -10995,117 +11268,119 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom schemas m
                   "type": "object",
                 },
               },
-            ],
-            "properties": {
-              "email": {
-                "format": "email",
-                "title": "E-mail",
-                "type": "string",
-              },
-              "fakturacia": {
-                "allOf": [
-                  {
-                    "if": {
-                      "properties": {
-                        "sposobPlatby": {
-                          "const": "Platba na faktúru",
-                        },
-                      },
-                      "required": [
-                        "sposobPlatby",
+              {
+                "if": {
+                  "properties": {
+                    "ziadatelTyp": {
+                      "enum": [
+                        "Právnická osoba",
+                        "Právnická osoba s povolením na vstup do ZEVO",
                       ],
-                      "type": "object",
                     },
-                    "then": {
+                  },
+                  "required": [
+                    "ziadatelTyp",
+                  ],
+                  "type": "object",
+                },
+                "then": {
+                  "properties": {
+                    "fakturacia": {
                       "allOf": [
                         {
                           "if": {
                             "properties": {
-                              "elektronickaFaktura": {
-                                "const": true,
+                              "sposobPlatby": {
+                                "const": "Platba na faktúru",
                               },
                             },
                             "required": [
-                              "elektronickaFaktura",
+                              "sposobPlatby",
                             ],
                             "type": "object",
                           },
                           "then": {
+                            "allOf": [
+                              {
+                                "if": {
+                                  "properties": {
+                                    "elektronickaFaktura": {
+                                      "const": true,
+                                    },
+                                  },
+                                  "required": [
+                                    "elektronickaFaktura",
+                                  ],
+                                  "type": "object",
+                                },
+                                "then": {
+                                  "properties": {
+                                    "emailPreFaktury": {
+                                      "format": "email",
+                                      "title": "E-mail pre zasielanie elektronických faktúr",
+                                      "type": "string",
+                                    },
+                                  },
+                                  "required": [
+                                    "emailPreFaktury",
+                                  ],
+                                  "type": "object",
+                                },
+                              },
+                            ],
                             "properties": {
-                              "emailPreFaktury": {
-                                "format": "email",
-                                "title": "E-mail pre zasielanie elektronických faktúr",
+                              "elektronickaFaktura": {
+                                "title": "Súhlasím so zaslaním elektronickej faktúry",
+                                "type": "boolean",
+                              },
+                              "iban": {
+                                "format": "ba-iban",
+                                "title": "IBAN",
                                 "type": "string",
                               },
                             },
                             "required": [
-                              "emailPreFaktury",
+                              "iban",
                             ],
                             "type": "object",
                           },
                         },
                       ],
                       "properties": {
-                        "elektronickaFaktura": {
-                          "title": "Súhlasím so zaslaním elektronickej faktúry",
-                          "type": "boolean",
-                        },
-                      },
-                      "required": [],
-                      "type": "object",
-                    },
-                  },
-                  {
-                    "if": {
-                      "properties": {
-                        "ziadatelTyp": {
-                          "enum": [
-                            "Právnická osoba",
-                            "Právnická osoba s povolením na vstup do ZEVO",
+                        "sposobPlatby": {
+                          "default": "Platba kartou",
+                          "oneOf": [
+                            {
+                              "const": "Platba kartou",
+                              "title": "Platba kartou",
+                            },
+                            {
+                              "const": "Platba na faktúru",
+                              "title": "Platba na faktúru",
+                            },
                           ],
-                        },
-                      },
-                      "required": [
-                        "ziadatelTyp",
-                      ],
-                      "type": "object",
-                    },
-                    "then": {
-                      "properties": {
-                        "iban": {
-                          "format": "ba-iban",
-                          "title": "IBAN",
+                          "title": "Spôsob platby",
                           "type": "string",
                         },
                       },
                       "required": [
-                        "iban",
+                        "sposobPlatby",
                       ],
                       "type": "object",
                     },
                   },
-                ],
-                "properties": {
-                  "sposobPlatby": {
-                    "default": "Platba kartou",
-                    "oneOf": [
-                      {
-                        "const": "Platba kartou",
-                        "title": "Platba kartou",
-                      },
-                      {
-                        "const": "Platba na faktúru",
-                        "title": "Platba na faktúru",
-                      },
-                    ],
-                    "title": "Spôsob platby",
-                    "type": "string",
-                  },
+                  "required": [
+                    "fakturacia",
+                  ],
+                  "type": "object",
                 },
-                "required": [
-                  "sposobPlatby",
-                ],
-                "type": "object",
+              },
+            ],
+            "properties": {
+              "email": {
+                "format": "email",
+                "title": "E-mail",
+                "type": "string",
               },
               "telefon": {
                 "format": "ba-phone-number",
@@ -11136,7 +11411,6 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom schemas m
               "ziadatelTyp",
               "telefon",
               "email",
-              "fakturacia",
             ],
             "title": "Žiadateľ",
             "type": "object",
@@ -12553,9 +12827,9 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom schemas m
         },
         "ui:order": [
           "sposobPlatby",
+          "iban",
           "elektronickaFaktura",
           "emailPreFaktury",
-          "iban",
         ],
       },
       "icDph": {
@@ -12575,6 +12849,7 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom schemas m
       "konatel": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko konateľa",
           "inputType": "text",
         },
         "ui:widget": "Input",
@@ -12658,6 +12933,7 @@ exports[`Form definitions olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom schemas m
       "zastupeny": {
         "ui:label": false,
         "ui:options": {
+          "helptextHeader": "Uveďte meno a priezvisko osoby zastupujúcej na základe splnomocnenia",
           "inputType": "text",
         },
         "ui:widget": "Input",
diff --git a/forms-shared/tests/helpers.ts b/forms-shared/tests/helpers.ts
index 2a35cc60d..9601a5a15 100644
--- a/forms-shared/tests/helpers.ts
+++ b/forms-shared/tests/helpers.ts
@@ -3,6 +3,7 @@ import {
   createCamelCaseOptionsV2,
   createCondition,
   createStringOptions,
+  createStringOptionsV2,
 } from '../src/generator/helpers'
 
 describe('createCondition', () => {
@@ -170,6 +171,75 @@ describe('createStringOptions', () => {
   })
 })
 
+describe('createStringOptionsV2', () => {
+  it('should create options from a list of objects with default option', () => {
+    const result = createStringOptionsV2([
+      { title: 'Option 1', description: 'Description 1' },
+      { title: 'Option 2' },
+      { title: 'Option 3' },
+    ])
+    expect(result).toEqual([
+      { value: 'Option 1', title: 'Option 1', description: 'Description 1', isDefault: true },
+      { value: 'Option 2', title: 'Option 2', isDefault: undefined },
+      { value: 'Option 3', title: 'Option 3', isDefault: undefined },
+    ])
+  })
+
+  it('should create options from a list of objects without default option', () => {
+    const result = createStringOptionsV2(
+      [
+        { title: 'Option 1', description: 'Description 1' },
+        { title: 'Option 2' },
+        { title: 'Option 3' },
+      ],
+      false,
+    )
+    expect(result).toEqual([
+      { value: 'Option 1', title: 'Option 1', description: 'Description 1' },
+      { value: 'Option 2', title: 'Option 2' },
+      { value: 'Option 3', title: 'Option 3' },
+    ])
+  })
+
+  it('should handle an empty input array', () => {
+    const result = createStringOptionsV2([])
+    expect(result).toEqual([])
+  })
+
+  it('should handle a single object input', () => {
+    const result = createStringOptionsV2([{ title: 'Option 1' }])
+    expect(result).toEqual([{ value: 'Option 1', title: 'Option 1', isDefault: true }])
+  })
+
+  it('should throw an error if options have duplicate values', () => {
+    expect(() =>
+      createStringOptionsV2([{ title: 'Option 1' }, { title: 'Option 1' }]),
+    ).toThrowError('Options must have unique values')
+  })
+
+  it('should preserve additional properties from input objects', () => {
+    const result = createStringOptionsV2([
+      { title: 'Option 1', extra: 'data1', nested: { prop: 'value' } },
+      { title: 'Option 2', extra: 'data2' },
+    ])
+    expect(result).toEqual([
+      {
+        value: 'Option 1',
+        title: 'Option 1',
+        extra: 'data1',
+        nested: { prop: 'value' },
+        isDefault: true,
+      },
+      {
+        value: 'Option 2',
+        title: 'Option 2',
+        extra: 'data2',
+        isDefault: undefined,
+      },
+    ])
+  })
+})
+
 describe('createCamelCaseOptions', () => {
   it('should create options from a list of strings with default option', () => {
     const result = createCamelCaseOptions(['Option 1', 'Option 2', 'Option 3'])
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png
index 541180100..a106b0e26 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png
index 46d2c14cd..8d8defe10 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png
index fddae04e7..9c390112d 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png
index f7522d8d2..adec855c6 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-kolo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png
index 34201aba2..8be896697 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png
index 741c59ed3..d3d846368 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-olo-taxi-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png
index e82746c62..a9e21c355 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png
index 98f9c40ef..6c25e8fdc 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png
index 2f2dbdead..b99e3270e 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-desktop-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png
index c3b0509b6..3028665ab 100644
Binary files a/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png and b/forms-shared/tests/summary-email/__image_snapshots__/render-summary-email-ts-render-summary-email-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-email-should-match-mobile-screenshot-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-json/__snapshots__/getSummaryJson.ts.snap b/forms-shared/tests/summary-json/__snapshots__/getSummaryJson.ts.snap
index 775f3187b..48dc3c300 100644
--- a/forms-shared/tests/summary-json/__snapshots__/getSummaryJson.ts.snap
+++ b/forms-shared/tests/summary-json/__snapshots__/getSummaryJson.ts.snap
@@ -730,18 +730,6 @@ exports[`getSummaryJson oloEnergetickeZhodnotenieOdpaduVZevoExample summary JSON
           "type": "Field",
           "value": "10:00",
         },
-        {
-          "displayValues": [
-            {
-              "type": "String",
-              "value": "Platba kartou",
-            },
-          ],
-          "id": "root_ziadatel_fakturacia_sposobPlatby",
-          "label": "Spôsob platby",
-          "type": "Field",
-          "value": "Platba kartou",
-        },
       ],
       "id": "root_ziadatel",
       "title": "Žiadateľ",
@@ -1547,7 +1535,7 @@ exports[`getSummaryJson oloKoloTaxiExample summary JSON should match snapshot 1`
             },
           ],
           "id": "root_ziadatel_konatel",
-          "label": "Konateľ (meno, priezvisko)",
+          "label": "Konateľ",
           "type": "Field",
           "value": "Alexander Veľký",
         },
@@ -1559,7 +1547,7 @@ exports[`getSummaryJson oloKoloTaxiExample summary JSON should match snapshot 1`
             },
           ],
           "id": "root_ziadatel_zastupeny",
-          "label": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+          "label": "Zastúpený - na základe splnomocnenia",
           "type": "Field",
           "value": "Alexander Macedónsky",
         },
@@ -2662,13 +2650,13 @@ exports[`getSummaryJson oloOloTaxiExample summary JSON should match snapshot 1`]
           "displayValues": [
             {
               "type": "String",
-              "value": "07:55",
+              "value": "07:00 (pondelok - sobota)",
             },
           ],
           "id": "root_sluzba_preferovanyCasOdvozu",
           "label": "Preferovaný čas odvozu",
           "type": "Field",
-          "value": "07:55",
+          "value": "07:00 (pondelok - sobota)",
         },
         {
           "displayValues": [
@@ -2689,7 +2677,7 @@ exports[`getSummaryJson oloOloTaxiExample summary JSON should match snapshot 1`]
               "value": "Súhlasím s platbou za službu OLO Taxi",
             },
           ],
-          "id": "root_sluzba_suhlasSDarom",
+          "id": "root_sluzba_suhlasSPlatbou",
           "label": "Vyjadrenie súhlasu s platbou",
           "type": "Field",
           "value": true,
@@ -2973,7 +2961,7 @@ exports[`getSummaryJson oloTriedenyZberPapieraPlastovASklaPrePravnickeOsobyExamp
             },
           ],
           "id": "root_ziadatel_konatel",
-          "label": "Konateľ (meno, priezvisko)",
+          "label": "Konateľ",
           "type": "Field",
           "value": "Milan Voda",
         },
@@ -2985,7 +2973,7 @@ exports[`getSummaryJson oloTriedenyZberPapieraPlastovASklaPrePravnickeOsobyExamp
             },
           ],
           "id": "root_ziadatel_zastupeny",
-          "label": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+          "label": "Zastúpený - na základe splnomocnenia",
           "type": "Field",
           "value": "Martin Rieka",
         },
@@ -3679,7 +3667,7 @@ exports[`getSummaryJson oloUzatvorenieZmluvyONakladaniSOdpadom summary JSON shou
             },
           ],
           "id": "root_ziadatel_konatel",
-          "label": "Konateľ (meno, priezvisko)",
+          "label": "Konateľ",
           "type": "Field",
           "value": "Konatel Konajuci",
         },
@@ -3691,7 +3679,7 @@ exports[`getSummaryJson oloUzatvorenieZmluvyONakladaniSOdpadom summary JSON shou
             },
           ],
           "id": "root_ziadatel_zastupeny",
-          "label": "Zastúpený - na základe splnomocnenia (meno, priezvisko)",
+          "label": "Zastúpený - na základe splnomocnenia",
           "type": "Field",
           "value": "Jozef Mrkva",
         },
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-1-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-1-snap.png
index 1f3aa41e1..419f8b3b9 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-1-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-2-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-2-snap.png
index 5b125a0bb..dd68b43b1 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-2-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-2-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-3-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-3-snap.png
index 628328726..e9043d9bf 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-3-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-3-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-4-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-4-snap.png
index 276da6bd0..163d33b26 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-4-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-energeticke-zhodnotenie-odpadu-v-zevo-example-summary-pdf-should-match-snapshot-4-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-kolo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-kolo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png
index d200c74e5..a6afb60b3 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-kolo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-kolo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-olo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-olo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png
index 31b8c8869..8c5e3b747 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-olo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-olo-taxi-example-summary-pdf-should-match-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-1-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-1-snap.png
index 8978c5d1e..7744bc183 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-1-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-2-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-2-snap.png
index e1ef42186..2771e9663 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-2-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-2-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-3-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-3-snap.png
index e74dde120..bc17f3abe 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-3-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-triedeny-zber-papiera-plastov-a-skla-pre-pravnicke-osoby-example-summary-pdf-should-match-snapshot-3-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-1-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-1-snap.png
index ef86b3614..7666a4415 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-1-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-1-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-2-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-2-snap.png
index d9e40f13f..0c8c7ab41 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-2-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-2-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-3-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-3-snap.png
index 327a76992..f54f4a452 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-3-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-3-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-4-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-4-snap.png
index 804cf3510..1f63d6063 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-4-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-4-snap.png differ
diff --git a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-5-snap.png b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-5-snap.png
index 9e8297c91..cb1802b33 100644
Binary files a/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-5-snap.png and b/forms-shared/tests/summary-pdf/__image_snapshots__/render-summary-pdf-ts-get-summary-json-olo-uzatvorenie-zmluvy-o-nakladani-s-odpadom-summary-pdf-should-match-snapshot-5-snap.png differ
diff --git a/next/components/forms/widget-components/DateTimePicker/TimePicker.tsx b/next/components/forms/widget-components/DateTimePicker/TimePicker.tsx
index 2aa65ea07..f6d3ca245 100644
--- a/next/components/forms/widget-components/DateTimePicker/TimePicker.tsx
+++ b/next/components/forms/widget-components/DateTimePicker/TimePicker.tsx
@@ -43,6 +43,7 @@ const TimePicker = forwardRef<HTMLDivElement, TimePickerProps>(
       customErrorPlace,
       size,
       labelSize,
+      displayOptionalLabel,
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       ...rest
     },
@@ -84,6 +85,7 @@ const TimePicker = forwardRef<HTMLDivElement, TimePickerProps>(
             customErrorPlace={customErrorPlace}
             size={size}
             labelSize={labelSize}
+            displayOptionalLabel={displayOptionalLabel}
           />
         </div>
         {/* {state?.isOpen && ( */}