diff --git a/client/res/templates/login-second-step.tpl b/client/res/templates/login-second-step.tpl
index 792212eb22..7f06869a75 100644
--- a/client/res/templates/login-second-step.tpl
+++ b/client/res/templates/login-second-step.tpl
@@ -7,10 +7,23 @@
                 <form id="login-form" onsubmit="return false;">
                     <div class="form-group">
                         <label for="field-code" max-length="7">{{translate 'Code' scope='User'}}</label>
-                        <input type="text" data-name="field-code" class="form-control" autocapitalize="off" autocorrect="off" tabindex="1" autocomplete="code">
+                        <input
+                            type="text"
+                            data-name="field-code"
+                            class="form-control"
+                            autocapitalize="off"
+                            autocorrect="off"
+                            tabindex="1"
+                            autocomplete="code"
+                        >
                     </div>
                     <div>
-                        <a href="javascript:" class="btn btn-link pull-right" data-action="backToLogin" tabindex="4">{{translate 'Back to login form' scope='User'}}</a>
+                        <a
+                            href="javascript:"
+                            class="btn btn-link pull-right"
+                            data-action="backToLogin"
+                            tabindex="4"
+                        >{{translate 'Back to login form' scope='User'}}</a>
                         <button type="submit" class="btn btn-primary" id="btn-send" tabindex="2">{{translate 'Submit'}}</button>
                     </div>
                 </form>
diff --git a/client/res/templates/login.tpl b/client/res/templates/login.tpl
index 67ac29f0d6..d459827bdd 100644
--- a/client/res/templates/login.tpl
+++ b/client/res/templates/login.tpl
@@ -11,15 +11,42 @@
                 <form id="login-form" onsubmit="return false;">
                     <div class="form-group">
                         <label for="field-username">{{translate 'Username'}}</label>
-                        <input type="text" name="username" id="field-userName" class="form-control" autocapitalize="off" autocorrect="off" tabindex="1" autocomplete="username">
+                        <input
+                            type="text"
+                            name="username"
+                            id="field-userName"
+                            class="form-control"
+                            autocapitalize="off"
+                            autocorrect="off"
+                            tabindex="1"
+                            autocomplete="username"
+                        >
                     </div>
                     <div class="form-group">
                         <label for="login">{{translate 'Password'}}</label>
-                        <input type="password" name="password" id="field-password" class="form-control" tabindex="2" autocomplete="current-password">
+                        <input
+                            type="password"
+                            name="password"
+                            id="field-password"
+                            class="form-control"
+                            tabindex="2"
+                            autocomplete="current-password"
+                        >
                     </div>
                     <div>
-                        {{#if showForgotPassword}}<a href="javascript:" class="btn btn-link pull-right" data-action="passwordChangeRequest" tabindex="4">{{translate 'Forgot Password?' scope='User'}}</a>{{/if}}
-                        <button type="submit" class="btn btn-primary" id="btn-login" tabindex="3">{{translate 'Login' scope='User'}}</button>
+                        {{#if showForgotPassword}}
+                        <a
+                            href="javascript:"
+                            class="btn btn-link pull-right"
+                            data-action="passwordChangeRequest"
+                            tabindex="4"
+                        >{{translate 'Forgot Password?' scope='User'}}</a>{{/if}}
+                        <button
+                            type="submit"
+                            class="btn btn-primary"
+                            id="btn-login"
+                            tabindex="3"
+                        >{{translate 'Login' scope='User'}}</button>
                     </div>
                 </form>
             </div>
diff --git a/client/res/templates/record/detail.tpl b/client/res/templates/record/detail.tpl
index 106ccef534..7e696839ae 100644
--- a/client/res/templates/record/detail.tpl
+++ b/client/res/templates/record/detail.tpl
@@ -2,15 +2,24 @@
     {{#unless buttonsDisabled}}
     <div class="detail-button-container button-container record-buttons clearfix">
         <div class="btn-group actions-btn-group" role="group">
-            {{#each buttonList}}{{button name scope=../../entityType label=label style=style hidden=hidden html=html}}{{/each}}
+            {{#each buttonList}}{{button name scope=../entityType label=label style=style hidden=hidden html=html}}{{/each}}
             {{#if dropdownItemList}}
-            <button type="button" class="btn btn-default dropdown-toggle dropdown-item-list-button{{#if dropdownItemListEmpty}} hidden{{/if}}" data-toggle="dropdown">
-                <span class="fas fa-ellipsis-h"></span>
-            </button>
+            <button
+                type="button"
+                class="btn btn-default dropdown-toggle dropdown-item-list-button{{#if dropdownItemListEmpty}} hidden{{/if}}"
+                data-toggle="dropdown"
+            ><span class="fas fa-ellipsis-h"></span></button>
             <ul class="dropdown-menu pull-left">
                 {{#each dropdownItemList}}
                 {{#if this}}
-                <li class="{{#if hidden}}hidden{{/if}}"><a href="javascript:" class="action" data-action="{{name}}" {{#each data}} data-{{@key}}="{{./this}}"{{/each}}>{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../entityType}}{{/if}}</a></li>
+                <li
+                    class="{{#if hidden}}hidden{{/if}}"
+                ><a
+                    href="javascript:"
+                    class="action"
+                    data-action="{{name}}"
+                    {{#each data}} data-{{@key}}="{{./this}}"{{/each}}
+                >{{#if html}}{{{html}}}{{else}}{{translate label scope=../entityType}}{{/if}}</a></li>
                 {{else}}
                     {{#unless @first}}
                     {{#unless @last}}
@@ -37,15 +46,25 @@
     </div>
     <div class="detail-button-container button-container edit-buttons hidden clearfix">
         <div class="btn-group actions-btn-group" role="group">
-        {{#each buttonEditList}}{{button name scope=../../entityType label=label style=style hidden=hidden html=html}}{{/each}}
+        {{#each buttonEditList}}{{button name scope=../entityType label=label style=style hidden=hidden html=html}}{{/each}}
         {{#if dropdownEditItemList}}
-        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-            <span class="fas fa-ellipsis-h"></span>
-        </button>
+        <button
+            type="button"
+            class="btn btn-default dropdown-toggle"
+            data-toggle="dropdown"
+        ><span class="fas fa-ellipsis-h"></span></button>
         <ul class="dropdown-menu pull-left">
             {{#each dropdownEditItemList}}
             {{#if this}}
-            <li class="{{#if hidden}}hidden{{/if}}"><a href="javascript:" class="action" data-action="{{name}}">{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../entityType}}{{/if}}</a></li>
+            <li
+                class="{{#if hidden}}hidden{{/if}}"
+            >
+                <a
+                    href="javascript:"
+                    class="action"
+                    data-action="{{name}}"
+                >{{#if html}}{{{html}}}{{else}}{{translate label scope=../entityType}}{{/if}}</a>
+            </li>
             {{else}}
                 {{#unless @first}}
                 {{#unless @last}}
diff --git a/client/res/templates/record/edit.tpl b/client/res/templates/record/edit.tpl
index 1924007bb3..c20428aa36 100644
--- a/client/res/templates/record/edit.tpl
+++ b/client/res/templates/record/edit.tpl
@@ -2,7 +2,7 @@
     {{#unless buttonsDisabled}}
     <div class="detail-button-container button-container record-buttons clearfix">
         <div class="btn-group actions-btn-group" role="group">
-        {{#each buttonList}}{{button name scope=../../entityType label=label style=style html=html}}{{/each}}
+        {{#each buttonList}}{{button name scope=../entityType label=label style=style html=html}}{{/each}}
         {{#if dropdownItemList}}
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
             <span class="fas fa-ellipsis-h"></span>
@@ -10,7 +10,13 @@
         <ul class="dropdown-menu pull-left">
             {{#each dropdownItemList}}
             {{#if this}}
-            <li><a href="javascript:" class="action" data-action="{{name}}">{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../entityType}}{{/if}}</a></li>
+            <li>
+                <a
+                    href="javascript:"
+                    class="action"
+                    data-action="{{name}}"
+                >{{#if html}}{{{html}}}{{else}}{{translate label scope=../entityType}}{{/if}}</a>
+            </li>
             {{else}}
                 {{#unless @first}}
                 {{#unless @last}}
diff --git a/client/res/templates/record/kanban-item.tpl b/client/res/templates/record/kanban-item.tpl
index ebb14b23cf..ce18a67436 100644
--- a/client/res/templates/record/kanban-item.tpl
+++ b/client/res/templates/record/kanban-item.tpl
@@ -4,13 +4,16 @@
         <div>
             {{#if isFirst}}
             {{#unless rowActionsDisabled}}
-            <div class="pull-right item-menu-container">{{{../../../itemMenu}}}</div>
+            <div class="pull-right item-menu-container">{{{../itemMenu}}}</div>
             {{/unless}}
             {{/if}}
             <div class="form-group">
-                <div class="field{{#if isAlignRight}} field-right-align{{/if}}{{#if isLarge}} field-large{{/if}}" data-name="{{name}}">{{{var key ../this}}}</div>
+                <div
+                    class="field{{#if isAlignRight}} field-right-align{{/if}}{{#if isLarge}} field-large{{/if}}"
+                    data-name="{{name}}"
+                >{{{var key ../this}}}</div>
             </div>
         </div>
         {{/each}}
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/client/res/templates/record/kanban.tpl b/client/res/templates/record/kanban.tpl
index afb5e1aaf4..c13b7421be 100644
--- a/client/res/templates/record/kanban.tpl
+++ b/client/res/templates/record/kanban.tpl
@@ -8,7 +8,7 @@
     {{/if}}
 
     {{#each buttonList}}
-        {{button name scope=../../scope label=label style=style}}
+        {{button name scope=../scope label=label style=style}}
     {{/each}}
 </div>
 {{/if}}
diff --git a/client/res/templates/record/list-expanded.tpl b/client/res/templates/record/list-expanded.tpl
index e0c1ce1e5d..6e7556e798 100644
--- a/client/res/templates/record/list-expanded.tpl
+++ b/client/res/templates/record/list-expanded.tpl
@@ -10,13 +10,23 @@
     {{#if checkboxes}}
     {{#if massActionList}}
     <div class="btn-group actions">
-        <button type="button" class="btn btn-default btn-sm dropdown-toggle actions-button" data-toggle="dropdown" disabled>
-        {{translate 'Actions'}}
-        <span class="caret"></span>
+        <button
+            type="button"
+            class="btn btn-default btn-sm dropdown-toggle actions-button"
+            data-toggle="dropdown"
+            disabled
+        >
+            {{translate 'Actions'}}
+            <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
             {{#each massActionList}}
-            <li><a href="javascript:" data-action="{{./this}}" class='mass-action'>{{translate this category="massActions" scope=../scope}}</a></li>
+            <li>
+                <a
+                    href="javascript:"
+                    data-action="{{./this}}"
+                    class='mass-action'
+                >{{translate this category="massActions" scope=../scope}}</a></li>
             {{/each}}
         </ul>
     </div>
@@ -24,7 +34,7 @@
     {{/if}}
 
     {{#each buttonList}}
-        {{button name scope=../../scope label=label style=style}}
+        {{button name scope=../scope label=label style=style}}
     {{/each}}
 </div>
 {{/if}}
@@ -37,10 +47,17 @@
         </li>
     {{/each}}
     </ul>
+
     {{#unless paginationEnabled}}
     {{#if showMoreEnabled}}
     <div class="show-more{{#unless showMoreActive}} hide{{/unless}}">
-        <a type="button" href="javascript:" class="btn btn-default btn-block"  data-action="showMore" {{#if showCount}}title="{{translate 'Total'}}: {{totalCountFormatted}}"{{/if}}>
+        <a
+            type="button"
+            href="javascript:"
+            class="btn btn-default btn-block"
+            data-action="showMore"
+            {{#if showCount}}title="{{translate 'Total'}}: {{totalCountFormatted}}"{{/if}}
+        >
             {{#if showCount}}
             <div class="pull-right text-muted more-count">{{moreCountFormatted}}</div>
             {{/if}}
diff --git a/client/res/templates/record/list-nested-categories.tpl b/client/res/templates/record/list-nested-categories.tpl
index 7b0a13edc6..641f55cca9 100644
--- a/client/res/templates/record/list-nested-categories.tpl
+++ b/client/res/templates/record/list-nested-categories.tpl
@@ -1,4 +1,3 @@
-
 {{#unless isLoading}}
 <div class="list-nested-categories">
 
diff --git a/client/res/templates/record/list-pagination.tpl b/client/res/templates/record/list-pagination.tpl
index 3df7d772a8..c5fbfbcbfe 100644
--- a/client/res/templates/record/list-pagination.tpl
+++ b/client/res/templates/record/list-pagination.tpl
@@ -16,5 +16,3 @@
         <a href="javascript:" data-page="last"> <i class="fas fa-fast-forward"></i> </a>
     </li>
 </ul>
-
-
diff --git a/client/res/templates/record/list-tree.tpl b/client/res/templates/record/list-tree.tpl
index 2a87b8e8ae..f8a3fd9e2b 100644
--- a/client/res/templates/record/list-tree.tpl
+++ b/client/res/templates/record/list-tree.tpl
@@ -2,7 +2,7 @@
 {{#if topBar}}
 <div class="list-buttons-container clearfix">
     {{#each buttonList}}
-        {{button name scope=../../scope label=label style=style}}
+        {{button name scope=../scope label=label style=style}}
     {{/each}}
 </div>
 {{/if}}
@@ -54,7 +54,11 @@
 
     {{#if showRoot}}
     <div class="root-item">
-    <a href="#{{scope}}" class="action link{{#if rootIsSelected}} text-bold{{/if}}" data-action="selectRoot">{{rootName}}{{#if isExpanded}} <span class="fas fa-level-down-alt fa-sm"></span>{{/if}}</a>
+    <a
+        href="#{{scope}}"
+        class="action link{{#if rootIsSelected}} text-bold{{/if}}"
+        data-action="selectRoot"
+    >{{rootName}}{{#if isExpanded}} <span class="fas fa-level-down-alt fa-sm"></span>{{/if}}</a>
     </div>
     {{/if}}
 
@@ -67,7 +71,12 @@
     {{#unless createDisabled}}
     <li class="list-group-item">
         <div>
-            <a href="javascript:" data-action="create" class="action small" title="{{translate 'Add'}}"><span class="fas fa-plus"></span></a>
+            <a
+                href="javascript:"
+                data-action="create"
+                class="action small"
+                title="{{translate 'Add'}}"
+            ><span class="fas fa-plus"></span></a>
         </div>
     </li>
     {{/unless}}
diff --git a/client/res/templates/record/list.tpl b/client/res/templates/record/list.tpl
index 500f0b5d5b..fdd97c8831 100644
--- a/client/res/templates/record/list.tpl
+++ b/client/res/templates/record/list.tpl
@@ -11,25 +11,35 @@
     {{#if displayActionsButtonGroup}}
     <div class="btn-group actions">
         {{#if massActionList}}
-        <button type="button" class="btn btn-default dropdown-toggle actions-button hidden" data-toggle="dropdown">
-        {{translate 'Actions'}}
-        <span class="caret"></span>
-        </button>
+        <button
+            type="button"
+            class="btn btn-default dropdown-toggle actions-button hidden"
+            data-toggle="dropdown"
+        >{{translate 'Actions'}}<span class="caret"></span></button>
         {{/if}}
         {{#if buttonList.length}}
         {{#each buttonList}}
-            {{button name scope=../../scope label=label style=style hidden=hidden}}
+            {{button name scope=../scope label=label style=style hidden=hidden}}
         {{/each}}
         {{/if}}
+
         <div class="btn-group">
             {{#if dropdownItemList.length}}
-            <button type="button" class="btn btn-text dropdown-toggle dropdown-item-list-button" data-toggle="dropdown">
-                <span class="fas fa-ellipsis-h"></span>
-            </button>
+            <button
+                type="button"
+                class="btn btn-text dropdown-toggle dropdown-item-list-button"
+                data-toggle="dropdown"
+            ><span class="fas fa-ellipsis-h"></span></button>
             <ul class="dropdown-menu pull-left">
                 {{#each dropdownItemList}}
                 {{#if this}}
-                <li class="{{#if hidden}}hidden{{/if}}"><a href="javascript:" class="action" data-action="{{name}}">{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../entityType}}{{/if}}</a></li>
+                <li class="{{#if hidden}}hidden{{/if}}"
+                >
+                <a
+                    href="javascript:"
+                    class="action"
+                    data-action="{{name}}"
+                >{{#if html}}{{{html}}}{{else}}{{translate label scope=../entityType}}{{/if}}</a></li>
                 {{else}}
                     {{#unless @first}}
                     {{#unless @last}}
@@ -41,11 +51,17 @@
             </ul>
             {{/if}}
         </div>
+
         {{#if massActionList}}
         <ul class="dropdown-menu actions-menu">
             {{#each massActionList}}
             {{#if this}}
-            <li><a href="javascript:" data-action="{{./this}}" class='mass-action'>{{translate this category="massActions" scope=../../scope}}</a></li>
+            <li>
+                <a
+                    href="javascript:"
+                    data-action="{{./this}}"
+                    class='mass-action'
+                >{{translate this category="massActions" scope=../scope}}</a></li>
             {{else}}
             {{#unless @first}}
             {{#unless @last}}
@@ -67,7 +83,13 @@
             <ul class="dropdown-menu actions-menu">
                 {{#each massActionList}}
                 {{#if this}}
-                <li><a href="javascript:" data-action="{{./this}}" class='mass-action'>{{translate this category="massActions" scope=../../scope}}</a></li>
+                <li>
+                    <a
+                        href="javascript:"
+                        data-action="{{./this}}"
+                        class='mass-action'
+                    >{{translate this category="massActions" scope=../scope}}</a>
+                </li>
                 {{else}}
                 {{#unless @first}}
                 {{#unless @last}}
@@ -103,19 +125,34 @@
                             <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu">
-                            <li><a href="javascript:" data-action="selectAllResult">{{translate 'Select All Results'}}</a></li>
+                            <li>
+                                <a href="javascript:" data-action="selectAllResult">{{translate 'Select All Results'}}</a>
+                            </li>
                         </ul>
                     </div>
                     {{/unless}}
-
                 </th>
                 {{/if}}
                 {{#each headerDefs}}
-                <th {{#if width}} width="{{width}}"{{/if}}{{#if align}} style="text-align: {{align}};"{{/if}}>
+                <th
+                    {{#if width}} width="{{width}}"{{/if}}{{#if align}}
+                    style="text-align: {{align}};"{{/if}}
+                >
                     {{#if this.isSortable}}
-                        <a href="javascript:" class="sort" data-name="{{this.name}}">{{label}}</a>
-                        {{#if this.isSorted}}{{#unless this.isDesc}}<span class="fas fa-chevron-down fa-sm"></span>{{else}}<span class="fas fa-chevron-up fa-sm"></span>{{/unless}}{{/if}}
-                    {{else}}{{label}}{{/if}}
+                        <a
+                            href="javascript:"
+                            class="sort"
+                            data-name="{{this.name}}"
+                        >{{label}}</a>
+                        {{#if this.isSorted}}
+                            {{#unless this.isDesc}}<span class="fas fa-chevron-down fa-sm"></span>
+                            {{else}}
+                                <span class="fas fa-chevron-up fa-sm"></span>
+                            {{/unless}}
+                        {{/if}}
+                    {{else}}
+                        {{label}}
+                    {{/if}}
                 </th>
                 {{/each}}
             </tr>
@@ -132,7 +169,13 @@
     {{#unless paginationEnabled}}
     {{#if showMoreEnabled}}
     <div class="show-more{{#unless showMoreActive}} hide{{/unless}}">
-        <a type="button" href="javascript:" class="btn btn-default btn-block" data-action="showMore" {{#if showCount}}title="{{translate 'Total'}}: {{totalCountFormatted}}"{{/if}}>
+        <a
+            type="button"
+            href="javascript:"
+            class="btn btn-default btn-block"
+            data-action="showMore"
+            {{#if showCount}}title="{{translate 'Total'}}: {{totalCountFormatted}}"{{/if}}
+        >
             {{#if showCount}}
             <div class="pull-right text-muted more-count">{{moreCountFormatted}}</div>
             {{/if}}
diff --git a/client/res/templates/record/merge.tpl b/client/res/templates/record/merge.tpl
index 50ee8f15b7..f51f497873 100644
--- a/client/res/templates/record/merge.tpl
+++ b/client/res/templates/record/merge.tpl
@@ -18,13 +18,13 @@
             {{#if hasCreatedAt}}
             <tr>
                 <td align="right">
-                    {{translate 'createdAt' scope=../scope category='fields'}}
+                    {{translate 'createdAt' scope=scope category='fields'}}
                 </td>
                 {{#each dataList}}
                 <td></td>
                 <td data-id="{{id}}">
                     <div class="field" data-name="createdAt">
-                        {{{var createdAtViewName ../../this}}}
+                        {{{var createdAtViewName ../this}}}
                     </div>
                 </td>
                 {{/each}}
@@ -38,7 +38,7 @@
                 {{#each columns}}
                 <td>
                     {{#unless isReadOnly}}
-                    <input type="radio" name="{{../../name}}" value="{{../id}}" data-id="{{../id}}" class="pull-right field-radio">
+                    <input type="radio" name="{{../name}}" value="{{id}}" data-id="{{id}}" class="pull-right field-radio">
                     {{/unless}}
                 </td>
                 <td data-id="{{id}}">
diff --git a/client/res/templates/record/panel-actions.tpl b/client/res/templates/record/panel-actions.tpl
index 210dde2023..c3b329697d 100644
--- a/client/res/templates/record/panel-actions.tpl
+++ b/client/res/templates/record/panel-actions.tpl
@@ -1,22 +1,38 @@
 {{#each buttonList}}
-<button type="button" class="btn btn-{{#if ../defs.style}}{{../defs.style}}{{else}}default{{/if}} btn-sm action{{#if hidden}} hidden{{/if}}" data-action="{{action}}" data-panel="{{../defs.name}}" {{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}} title="{{#if title}}{{translate title scope=../../scope}}{{/if}}">{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../scope}}{{/if}}</button>
+<button
+    type="button"
+    class="btn btn-{{#if ../defs.style}}{{../defs.style}}{{else}}default{{/if}} btn-sm action{{#if hidden}} hidden{{/if}}"
+    data-action="{{action}}"
+    data-panel="{{../defs.name}}" {{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}}
+    title="{{#if title}}{{translate title scope=../scope}}{{/if}}"
+>{{#if html}}{{{html}}}{{else}}{{translate label scope=../scope}}{{/if}}</button>
 {{/each}}
 
 {{#if actionList}}
-    <button type="button" class="btn btn-{{#if defs.style}}{{defs.style}}{{else}}default{{/if}} btn-sm dropdown-toggle" data-toggle="dropdown">
-        <span class="fas fa-ellipsis-h"></span>
-    </button>
-    <ul class="dropdown-menu">
-        {{#each actionList}}
-        {{#if this}}
-        <li><a {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}} class="action{{#if hidden}} hidden{{/if}}" {{#if action}} data-panel="{{../../../defs.name}}" data-action="{{action}}"{{/if}}{{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}}>{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../scope}}{{/if}}</a></li>
-        {{else}}
-        {{#unless @first}}
-        {{#unless @last}}
-        <li class="divider"></li>
-        {{/unless}}
-        {{/unless}}
+<button
+    type="button"
+    class="btn btn-{{#if defs.style}}{{defs.style}}{{else}}default{{/if}} btn-sm dropdown-toggle"
+    data-toggle="dropdown"
+><span class="fas fa-ellipsis-h"></span></button>
+<ul class="dropdown-menu">
+    {{#each actionList}}
+    {{#if this}}
+    <li><a
+        href="{{#if link}}{{link}}{{else}}javascript:{{/if}}"
+        class="action{{#if hidden}} hidden{{/if}}"
+        {{#if action}}
+            data-panel="{{../defs.name}}"
+            data-action="{{action}}"
         {{/if}}
-        {{/each}}
-    </ul>
+        {{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}}
+    >{{#if html}}{{{html}}}{{else}}{{translate label scope=../scope}}{{/if}}</a></li>
+    {{else}}
+    {{#unless @first}}
+    {{#unless @last}}
+    <li class="divider"></li>
+    {{/unless}}
+    {{/unless}}
+    {{/if}}
+    {{/each}}
+</ul>
 {{/if}}
diff --git a/client/res/templates/record/panels/side.tpl b/client/res/templates/record/panels/side.tpl
index 33b5380536..21b3714bd6 100644
--- a/client/res/templates/record/panels/side.tpl
+++ b/client/res/templates/record/panels/side.tpl
@@ -3,7 +3,14 @@
     {{#each fieldList}}
     <div class="cell form-group col-sm-6 col-md-12{{#if hidden}} hidden-cell{{/if}}" data-name="{{name}}">
         {{#unless noLabel}}
-        <label class="control-label{{#if hidden}} hidden{{/if}}" data-name="{{name}}"><span class="label-text">{{#if labelText}}{{labelText}}{{else}}{{translate label scope=../../../model.name category='fields'}}{{/if}}</span></label>
+        <label
+            class="control-label{{#if hidden}} hidden{{/if}}"
+            data-name="{{name}}"
+        >
+            <span
+                class="label-text"
+            >{{#if labelText}}{{labelText}}{{else}}{{translate label scope=../model.name category='fields'}}{{/if}}</span>
+        </label>
         {{/unless}}
         <div class="field{{#if hidden}} hidden{{/if}}" data-name="{{name}}">
         {{{var viewKey ../this}}}
diff --git a/client/res/templates/record/row-actions/default.tpl b/client/res/templates/record/row-actions/default.tpl
index f683d6e866..9b90b03f28 100644
--- a/client/res/templates/record/row-actions/default.tpl
+++ b/client/res/templates/record/row-actions/default.tpl
@@ -1,15 +1,26 @@
 {{#if actionList.length}}
 <div class="list-row-buttons btn-group pull-right">
-    <button type="button" class="btn btn-link btn-sm dropdown-toggle" data-toggle="dropdown">
-        <span class="caret"></span>
-    </button>
+    <button
+        type="button"
+        class="btn btn-link btn-sm dropdown-toggle"
+        data-toggle="dropdown"
+    ><span class="caret"></span></button>
     <ul class="dropdown-menu pull-right">
     {{#each actionList}}
-        <li><a {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}} class="action" {{#if action}} data-action={{action}}{{/if}}{{#each data}} data-{{@key}}="{{./this}}"{{/each}}>{{#if html}}{{{html}}}{{else}}{{translate label scope=../../scope}}{{/if}}</a></li>
+        <li>
+            <a
+                href="{{#if link}}{{link}}{{else}}javascript:{{/if}}"
+                class="action"
+                {{#if action}}
+                    data-action="{{action}}"
+                {{/if}}
+                {{#each data}}
+                    data-{{@key}}="{{./this}}"
+                {{/each}}
+            >{{#if html}}{{{html}}}{{else}}{{translate label scope=../scope}}{{/if}}
+            </a>
+        </li>
     {{/each}}
     </ul>
 </div>
 {{/if}}
-
-
-
diff --git a/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl
index ef49655dcd..41efc49df2 100644
--- a/client/res/templates/record/search.tpl
+++ b/client/res/templates/record/search.tpl
@@ -3,45 +3,115 @@
     <div class="form-group{{#if isWide}} col-lg-7{{/if}} col-md-8 col-sm-9">
         <div class="input-group">
             <div class="input-group-btn left-dropdown{{#unless leftDropdown}} hidden{{/unless}}">
-                <button type="button" class="btn btn-default dropdown-toggle filters-button" title="{{translate 'Filter'}}" data-toggle="dropdown" tabindex="-1">
+                <button
+                    type="button"
+                    class="btn btn-default dropdown-toggle filters-button"
+                    title="{{translate 'Filter'}}"
+                    data-toggle="dropdown"
+                    tabindex="-1"
+                >
                     <span class="filters-label"></span>
                     <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu pull-left filter-menu">
 
-                    <li><a class="preset" tabindex="-1" href="javascript:" data-name="" data-action="selectPreset"><div>{{translate 'all' category='presetFilters' scope=entityType}}</div></a></li>
+                    <li>
+                        <a
+                            class="preset"
+                            tabindex="-1"
+                            href="javascript:"
+                            data-name=""
+                            data-action="selectPreset"
+                        ><div>{{translate 'all' category='presetFilters' scope=entityType}}</div></a>
+                    </li>
                     {{#each presetFilterList}}
-                    <li><a class="preset" tabindex="-1" href="javascript:" data-name="{{name}}" data-action="selectPreset"><div>{{#if label}}{{label}}{{else}}{{translate name category='presetFilters' scope=../../entityType}}{{/if}}</div></a></li>
+                    <li>
+                        <a
+                            class="preset"
+                            tabindex="-1"
+                            href="javascript:"
+                            data-name="{{name}}"
+                            data-action="selectPreset"
+                        >
+                            <div>
+                            {{#if label}}{{label}}{{else}}{{translate name category='presetFilters' scope=../entityType}}{{/if}}
+                            </div>
+                        </a>
+                    </li>
                     {{/each}}
                     <li class="divider preset-control hidden"></li>
 
-
-                    <li class="preset-control remove-preset hidden"><a tabindex="-1" href="javascript:" data-action="removePreset">{{translate 'Remove Filter'}}</a></li>
-                    <li class="preset-control save-preset hidden"><a tabindex="-1" href="javascript:" data-action="savePreset">{{translate 'Save Filter'}}</a></li>
+                    <li class="preset-control remove-preset hidden">
+                        <a tabindex="-1" href="javascript:" data-action="removePreset">{{translate 'Remove Filter'}}</a>
+                    </li>
+                    <li class="preset-control save-preset hidden">
+                        <a tabindex="-1" href="javascript:" data-action="savePreset">{{translate 'Save Filter'}}</a>
+                    </li>
                     {{#if boolFilterList.length}}
                         <li class="divider"></li>
                     {{/if}}
 
                     {{#each boolFilterList}}
-                        <li class="checkbox"><label><input type="checkbox" data-role="boolFilterCheckbox" data-name="{{./this}}" {{#ifPropEquals ../bool this true}}checked{{/ifPropEquals}}> {{translate this scope=../entityType category='boolFilters'}}</label></li>
+                        <li class="checkbox">
+                            <label>
+                                <input
+                                    type="checkbox"
+                                    data-role="boolFilterCheckbox"
+                                    data-name="{{./this}}"
+                                    {{#ifPropEquals ../bool this true}}checked{{/ifPropEquals}}
+                                > {{translate this scope=../entityType category='boolFilters'}}
+                            </label></li>
                     {{/each}}
                 </ul>
             </div>
-            {{#unless textFilterDisabled}}<input type="text" class="form-control text-filter" data-name="textFilter" value="{{textFilter}}" tabindex="1" autocomplete="espo-text-search">{{/unless}}
+            {{#unless textFilterDisabled}}
+            <input
+                type="text"
+                class="form-control text-filter"
+                data-name="textFilter"
+                value="{{textFilter}}"
+                tabindex="1"
+                autocomplete="espo-text-search"
+            >
+            {{/unless}}
             <div class="input-group-btn">
-                <button type="button" class="btn btn-default search btn-icon btn-icon-x-wide" data-action="search" title="{{translate 'Search'}}">
+                <button
+                    type="button"
+                    class="btn btn-default search btn-icon btn-icon-x-wide"
+                    data-action="search"
+                    title="{{translate 'Search'}}"
+                >
                     <span class="fa fa-search"></span>
                 </button>
-                <button type="button" class="btn btn-text btn-icon-wide dropdown-toggle add-filter-button" data-toggle="dropdown" tabindex="-1">
+                <button
+                    type="button"
+                    class="btn btn-text btn-icon-wide dropdown-toggle add-filter-button"
+                    data-toggle="dropdown"
+                    tabindex="-1"
+                >
                     <span class="fas fa-ellipsis-v"></span>
                 </button>
-                <button type="button" class="btn btn-text btn-icon-wide" data-action="reset" title="{{translate 'Reset'}}" style="visibility: hidden;">
+                <button
+                    type="button"
+                    class="btn btn-text btn-icon-wide"
+                    data-action="reset"
+                    title="{{translate 'Reset'}}"
+                    style="visibility: hidden;"
+                >
                     <span class="fas fa-times"></span>
                 </button>
                 <ul class="dropdown-menu pull-right filter-list">
                     <li class="dropdown-header">{{translate 'Add Field'}}</li>
                     {{#each advancedFields}}
-                        <li data-name="{{name}}" class="{{#if checked}}hidden{{/if}}"><a href="javascript:" class="add-filter" data-action="addFilter" data-name="{{name}}">{{translate name scope=../entityType category='fields'}}</a></li>
+                        <li
+                            data-name="{{name}}"
+                            class="{{#if checked}}hidden{{/if}}"
+                        ><a
+                            href="javascript:"
+                            class="add-filter"
+                            data-action="addFilter"
+                            data-name="{{name}}"
+                        >{{translate name scope=../entityType category='fields'}}</a></li>
                     {{/each}}
                 </ul>
             </div>
@@ -51,7 +121,13 @@
         {{#if hasViewModeSwitcher}}
         <div class="btn-group view-mode-switcher-buttons-group">
             {{#each viewModeDataList}}
-            <button type="button" data-name="{{name}}" data-action="switchViewMode" class="btn btn-icon btn-icon btn-text{{#ifEqual name ../viewMode}} active{{/ifEqual}}" title="{{title}}"><span class="{{iconClass}}"></span></button>
+            <button
+                type="button"
+                data-name="{{name}}"
+                data-action="switchViewMode"
+                class="btn btn-icon btn-icon btn-text{{#ifEqual name ../viewMode}} active{{/ifEqual}}"
+                title="{{title}}"
+            ><span class="{{iconClass}}"></span></button>
             {{/each}}
         </div>
         {{/if}}
diff --git a/client/res/templates/record/side.tpl b/client/res/templates/record/side.tpl
index 9005efd29a..e8bf6a723f 100644
--- a/client/res/templates/record/side.tpl
+++ b/client/res/templates/record/side.tpl
@@ -14,7 +14,7 @@
 >
     {{#if label}}
     <div class="panel-heading">
-        <div class="pull-right btn-group panel-actions-container">{{{var ../actionsViewKey ../../this}}}</div>
+        <div class="pull-right btn-group panel-actions-container">{{{var actionsViewKey ../this}}}</div>
 
         <h4 class="panel-title">
             {{#unless notRefreshable}}
diff --git a/client/res/templates/stream.tpl b/client/res/templates/stream.tpl
index dc7cbc1d6b..5277c3adef 100644
--- a/client/res/templates/stream.tpl
+++ b/client/res/templates/stream.tpl
@@ -8,9 +8,17 @@
         <div class="col-sm-5 col-xs-7">
             <div class="pull-right btn-group">
                 {{#each filterList}}
-                <button class="btn btn-text{{#ifEqual this ../filter}} active{{/ifEqual}}" data-action="selectFilter" data-name="{{./this}}">{{translate this scope='Note' category='filters'}}</button>
+                <button
+                    class="btn btn-text{{#ifEqual this ../filter}} active{{/ifEqual}}"
+                    data-action="selectFilter"
+                    data-name="{{./this}}"
+                >{{translate this scope='Note' category='filters'}}</button>
                 {{/each}}
-                <button class="btn btn-text btn-icon btn-icon-wide" data-action="refresh" title="{{translate 'checkForNewNotes' category='messages'}}"><span class="fas fa-sync-alt"></span></button>
+                <button
+                    class="btn btn-text btn-icon btn-icon-wide"
+                    data-action="refresh"
+                    title="{{translate 'checkForNewNotes' category='messages'}}"
+                ><span class="fas fa-sync-alt"></span></button>
             </div>
         </div>
     </div>
@@ -24,4 +32,3 @@
         <div class="list-container">{{{list}}}</div>
     </div>
 </div>
-