diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/binarytypeinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/binarytypeinput.hbs
index 4478ff50..98fe0e73 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/binarytypeinput.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/binarytypeinput.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/button.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/button.hbs
index af166413..9bdaffd5 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/button.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/button.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
   {{# if child.customImplementation }}
     <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/buttongroup.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/buttongroup.hbs
index 501b5d3b..1fc922b2 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/buttongroup.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/buttongroup.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} {{# neq (calculateSize child) 12.0 }}sm={ {{ calculateSize child }} }{{/ neq }}>
   <Grid container spacing={2}>
     {{# if child.customImplementation }}
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/checkbox.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/checkbox.hbs
index b783bec5..3caf799b 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/checkbox.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/checkbox.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/dateinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/dateinput.hbs
index 29deb27e..c5843ee4 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/dateinput.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/dateinput.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/datetimeinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/datetimeinput.hbs
index bc51ecb6..8e51b509 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/datetimeinput.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/datetimeinput.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs
index bc7330ec..5641fef0 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/divider.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs
index 25aaad47..27d34795 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationradio.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationradio.hbs
index 277663aa..78f23bbd 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationradio.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationradio.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs
index e51b4019..25aaa9eb 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs
@@ -1,4 +1,4 @@
-{{# if this.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ this.hiddenBy.name }}) && {{/ if }}
+{{# if this.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ this.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize this) 12.0 }}md={ {{ calculateSize this }} }{{/ neq }}>
     {{# if this.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/formatted.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/formatted.hbs
index 3649cd3e..c287852a 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/formatted.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/formatted.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/label.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/label.hbs
index e029d9e5..e0ac8c6e 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/label.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/label.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/link.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/link.hbs
index 80750124..a0984d87 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/link.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/link.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/numericinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/numericinput.hbs
index 516cc94a..91973433 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/numericinput.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/numericinput.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/spacer.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/spacer.hbs
index 98cd7fde..e2bf5907 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/spacer.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/spacer.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/tabcontroller.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/tabcontroller.hbs
index cc317312..5455c4d8 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/tabcontroller.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/tabcontroller.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid container item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/table.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/table.hbs
index 2c58f1c8..b655746d 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/table.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/table.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/text.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/text.hbs
index db8daa24..eb3c68eb 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/text.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/text.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textarea.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textarea.hbs
index f6be36f5..2cefc739 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textarea.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textarea.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textinput.hbs
index c814cf09..04a4ad39 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textinput.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/textinput.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/timeinput.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/timeinput.hbs
index 83a754e2..0e99a5df 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/timeinput.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/timeinput.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/trinarylogiccombo.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/trinarylogiccombo.hbs
index 4ef24a1e..53258bb2 100644
--- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/trinarylogiccombo.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/trinarylogiccombo.hbs
@@ -1,4 +1,4 @@
-{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
+{{# if child.hiddenBy }} { (actions?.is{{ safeName child }}Hidden ? !actions?.is{{ safeName child }}Hidden(data, editMode) : !data.{{ child.hiddenBy.name }}) && {{/ if }}
 <Grid item xs={12} sm={12} {{# neq (calculateSize child) 12.0 }}md={ {{ calculateSize child }} }{{/ neq }}>
     {{# if child.customImplementation }}
         <ComponentProxy
diff --git a/judo-ui-react/src/main/resources/actor/src/utilities/form-utils.ts.hbs b/judo-ui-react/src/main/resources/actor/src/utilities/form-utils.ts.hbs
index f478f8ec..b79f9cfe 100644
--- a/judo-ui-react/src/main/resources/actor/src/utilities/form-utils.ts.hbs
+++ b/judo-ui-react/src/main/resources/actor/src/utilities/form-utils.ts.hbs
@@ -1,7 +1,7 @@
 {{> fragment.header.hbs }}
 
 import type { Dispatch, SetStateAction } from 'react';
-import { format } from 'date-fns';
+import { format, parse } from 'date-fns';
 import type { TFunction } from 'i18next';
 
 export const uiDateToServiceDate = (date?: any | null): string | null => {
@@ -25,17 +25,14 @@ export const uiTimeToServiceTime = (time?: any | null): string | null => {
     if(time === undefined || time === null) {
         return null;
     }
-    const resolved: Date = typeof time === 'string' ? new Date(time) : time;
-    return resolved.getUTCHours().toString().padStart(2, '0') + ':' + resolved.getUTCMinutes().toString().padStart(2, '0');
+    // const resolved: Date = typeof time === 'string' ? new Date(time) : time;
+    // return resolved.getUTCHours().toString().padStart(2, '0') + ':' + resolved.getUTCMinutes().toString().padStart(2, '0');
+    return format(time, 'HH:mm:ss');
 }
 
-
 export const serviceTimeToUiTime = (timeStr?: any) => {
     if (typeof timeStr === 'string') {
-        let splittedTime = timeStr.split(':');
-        let date: Date = new Date();
-        date.setHours(Number(splittedTime[0]) - date.getTimezoneOffset() / 60, Number(splittedTime[1]));
-        return date;
+        return parse(timeStr, 'HH:mm:ss', new Date());
     }
     return timeStr;
 };