diff --git a/module/custom/ui/execution.html.php b/module/custom/ui/execution.html.php
index 02a3f8d8b8..dd4cb72cca 100644
--- a/module/custom/ui/execution.html.php
+++ b/module/custom/ui/execution.html.php
@@ -17,7 +17,7 @@ div
     $sidebarMenu,
     formPanel
     (
-        set::id('closedExecutionForm'),
+        setID('closedExecutionForm'),
         set::actions(array('submit')),
         set::actionsClass('w-2/3'),
         setClass('flex-auto ml-4'),
diff --git a/module/custom/ui/flow.html.php b/module/custom/ui/flow.html.php
index 4c79247896..bdee844c1f 100644
--- a/module/custom/ui/flow.html.php
+++ b/module/custom/ui/flow.html.php
@@ -12,7 +12,7 @@ namespace zin;
 
 formPanel
 (
-    set::id('flowForm'),
+    setID('flowForm'),
     set::actions(array('submit')),
     set::actionsClass('w-1/3'),
     span
diff --git a/module/custom/ui/kanban.html.php b/module/custom/ui/kanban.html.php
index c0c7fa605c..345d62fd63 100644
--- a/module/custom/ui/kanban.html.php
+++ b/module/custom/ui/kanban.html.php
@@ -15,7 +15,7 @@ div
     setClass('flex'),
     formPanel
     (
-        set::id('closedExecutionForm'),
+        setID('closedExecutionForm'),
         set::actions(array('submit')),
         setClass('flex-auto'),
         formGroup
diff --git a/module/custom/ui/limittaskdate.html.php b/module/custom/ui/limittaskdate.html.php
index 045ff2a3a7..bc5736f072 100644
--- a/module/custom/ui/limittaskdate.html.php
+++ b/module/custom/ui/limittaskdate.html.php
@@ -17,7 +17,7 @@ div
     $sidebarMenu,
     formPanel
     (
-        set::id('limitTaskDateForm'),
+        setID('limitTaskDateForm'),
         set::actions(array('submit')),
         set::actionsClass('w-2/3'),
         setClass('flex-auto ml-4'),
diff --git a/module/custom/ui/percent.html.php b/module/custom/ui/percent.html.php
index b6dc3ff203..18df4e1978 100644
--- a/module/custom/ui/percent.html.php
+++ b/module/custom/ui/percent.html.php
@@ -11,7 +11,7 @@ declare(strict_types=1);
 namespace zin;
 formPanel
 (
-    set::id('percentForm'),
+    setID('percentForm'),
     set::actions(array('submit')),
     formRow
     (
diff --git a/module/custom/ui/product.html.php b/module/custom/ui/product.html.php
index fdf78404f6..fcf1867a8b 100644
--- a/module/custom/ui/product.html.php
+++ b/module/custom/ui/product.html.php
@@ -17,7 +17,7 @@ div
     $sidebarMenu,
     formPanel
     (
-        set::id('closedProductForm'),
+        setID('closedProductForm'),
         set::actions(array('submit')),
         set::actionsClass('w-2/3'),
         setClass('flex-auto ml-4'),
diff --git a/module/custom/ui/required.html.php b/module/custom/ui/required.html.php
index 51bf24743e..c8d0bb853b 100644
--- a/module/custom/ui/required.html.php
+++ b/module/custom/ui/required.html.php
@@ -51,12 +51,12 @@ if(common::hasPriv('custom', 'resetRequired'))
 if(!in_array($module, array('productplan', 'release', 'testsuite', 'testreport', 'caselib', 'doc')) && $config->vision == 'rnd') include 'sidebar.html.php';
 div
 (
-    set::id('mainContent'),
+    setID('mainContent'),
     setClass('row has-sidebar-left'),
     isset($sidebarMenu) ? $sidebarMenu : null,
     formPanel
     (
-        set::id('requiredForm'),
+        setID('requiredForm'),
         setClass('flex-auto'),
         setClass(isset($sidebarMenu) ? 'ml-0.5' : null),
         set::actionsClass('w-1/2'),
diff --git a/module/custom/ui/set.html.php b/module/custom/ui/set.html.php
index a0d3cf1544..f2a562d553 100644
--- a/module/custom/ui/set.html.php
+++ b/module/custom/ui/set.html.php
@@ -211,8 +211,14 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                 (
                     'help',
                     setClass('pl-4 pt-2'),
-                    set('data-toggle', 'tooltip'),
-                    set('data-title', sprintf($lang->custom->notice->forceNotReview, $lang->$module->common))
+                    setData
+                    (
+                        array
+                        (
+                            'toggle' => 'tooltip',
+                            'title'  => sprintf($lang->custom->notice->forceNotReview, $lang->$module->common)
+                        )
+                    )
                 )
             )
         );
@@ -235,8 +241,14 @@ elseif(($module == 'story' || $module == 'testcase') && $field == 'review')
                 (
                     'help',
                     setClass('pl-4 pt-2'),
-                    set('data-toggle', 'tooltip'),
-                    set('data-title', sprintf($lang->custom->notice->forceReview, $lang->$module->common))
+                    setData
+                    (
+                        array
+                        (
+                            'toggle' => 'tooltip',
+                            'title'  => sprintf($lang->custom->notice->forceReview, $lang->$module->common)
+                        )
+                    )
                 )
             )
         );
@@ -475,7 +487,7 @@ else
 
 div
 (
-    set::id('mainContent'),
+    setID('mainContent'),
     setClass('row has-sidebar-left'),
     $sidebarMenu,
     formPanel
diff --git a/module/story/ui/batchcreate.html.php b/module/story/ui/batchcreate.html.php
index 1e8ea45ce0..6e00b532ae 100644
--- a/module/story/ui/batchcreate.html.php
+++ b/module/story/ui/batchcreate.html.php
@@ -41,7 +41,7 @@ formBatchPanel
 (
     on::click('#saveButton', 'customSubmit'),
     on::click('#saveDraftButton', 'customSubmit'),
-    set::id('dataform'),
+    setID('dataform'),
     $stories ? set::data($stories) : null,
     set::title($storyID ? $storyTitle . $lang->colon . $this->lang->story->subdivide : $this->lang->story->batchCreate),
     set::uploadParams('module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID&executionID=$executionID&plan=&type=$type")),
diff --git a/module/story/ui/linkstories.html.php b/module/story/ui/linkstories.html.php
index acdffb08da..a280b47822 100644
--- a/module/story/ui/linkstories.html.php
+++ b/module/story/ui/linkstories.html.php
@@ -27,10 +27,10 @@ $data = array();
 foreach($stories2Link as $story) $data[] = $this->story->formatStoryForList($story);
 
 modalHeader(set::title($story->type == 'story' ? $lang->story->linkStoriesAB : $lang->story->linkRequirementsAB));
-div(setID('searchFormPanel'), set('data-module', 'story'), searchToggle(set::open(true), set::module('story')));
+div(setID('searchFormPanel'), setData(array('module' => 'story')), searchToggle(set::open(true), set::module('story')));
 dtable
 (
-    set::id('linkStories'),
+    setID('linkStories'),
     set::userMap($users),
     set::cols($cols),
     set::data($data),
diff --git a/module/story/ui/submitreview.html.php b/module/story/ui/submitreview.html.php
index 90a60e0bcd..2ae8a35115 100644
--- a/module/story/ui/submitreview.html.php
+++ b/module/story/ui/submitreview.html.php
@@ -20,10 +20,10 @@ if(!$this->story->checkForceReview())
 {
     $needNotReviewBox = span
     (
-        set('class', 'input-group-addon'),
+        setClass('input-group-addon'),
         checkbox
         (
-            set::id('needNotReview'),
+            setID('needNotReview'),
             set::name('needNotReview'),
             set::text($lang->story->needNotReview),
             set::value(1)