diff --git a/templates/element/genericElements/ListTopBar/group_search.php b/templates/element/genericElements/ListTopBar/group_search.php
index 4359a43..7822e07 100644
--- a/templates/element/genericElements/ListTopBar/group_search.php
+++ b/templates/element/genericElements/ListTopBar/group_search.php
@@ -130,7 +130,8 @@
                 }
                 $searchType = $('<span/>')
                     .text(searchContain ? '<?= __('Contain') ?>' : '<?= __('Exact match') ?>')
-                    .attr('title', searchContain ? '<?= __('The search value will be used as a substring') ?>' : '<?= __('The search value must strictly match') ?>')
+                    .attr('title', searchContain ? '<?= __('The search value can be used as a substring with the wildcard operator `%`') ?>' : '<?= __('The search value must strictly match') ?>')
+                    .attr('style', 'cursor: help;')
                 tableData.push([fieldName, $searchType])
             });
             tableData.sort((a, b) => a[0] < b[0] ? -1 : 1)
diff --git a/templates/element/genericElements/ListTopBar/group_simple.php b/templates/element/genericElements/ListTopBar/group_simple.php
index 2c79909..187b616 100644
--- a/templates/element/genericElements/ListTopBar/group_simple.php
+++ b/templates/element/genericElements/ListTopBar/group_simple.php
@@ -5,7 +5,7 @@
             $elements .= $this->element('/genericElements/ListTopBar/element_' . (empty($element['type']) ? 'simple' : h($element['type'])), array('data' => $element, 'tableRandomValue' => $tableRandomValue));
         }
         echo sprintf(
-            '<div %s class="btn-group btn-group-sm mr-2" role="group" aria-label="button-group">%s</div>',
+            '<div %s class="btn-group btn-group-sm mr-2 flex-wrap" role="group" aria-label="button-group">%s</div>',
             (!empty($data['id'])) ? 'id="' . h($data['id']) . '"' : '',
             $elements
         );
diff --git a/templates/genericTemplates/confirm.php b/templates/genericTemplates/confirm.php
index ea4c3b2..0d2fbd9 100644
--- a/templates/genericTemplates/confirm.php
+++ b/templates/genericTemplates/confirm.php
@@ -13,7 +13,7 @@
             <?= $this->Form->postLink(
                 h($actionName),
                 $path,
-                ['class' => 'btn btn-primary button-execute']
+                ['class' => 'btn btn-primary button-execute', 'id' => 'submitButton']
                 )
             ?>
             <button type="button" class="btn btn-secondary cancel-button" data-dismiss="modal"><?= __('Cancel') ?></button>