diff --git a/templates/table/search/fields_table.phtml b/templates/table/search/fields_table.phtml
deleted file mode 100644
index 917b9e4fbf..0000000000
--- a/templates/table/search/fields_table.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<table class="data" <?php if ($searchType == 'zoom'): ?>
-                        id="tableFieldsId"
-                   <?php endif; ?>>
-    <?= PhpMyAdmin\Template::get('table/search/table_header')
-        ->render(array(
-            'geom_column_flag' => $geomColumnFlag
-        )); ?>
-    <tbody>
-    <?php if ($searchType == 'zoom'): ?>
-        <?= PhpMyAdmin\Template::get('table/search/rows_zoom')
-            ->render(array(
-                'self' => $self,
-                'column_names' => $columnNames,
-                'criteria_column_names' => $_POST['criteriaColumnNames'],
-                'criteria_column_types' => $_POST['criteriaColumnTypes'],
-        )) ?>
-    <?php else: ?>
-        <?= PhpMyAdmin\Template::get('table/search/rows_normal')
-            ->render(array(
-                'self' => $self,
-                'geom_column_flag' => $geomColumnFlag,
-                'column_names' => $columnNames,
-                'column_types' => $columnTypes,
-                'column_collations' => $columnCollations
-        )) ?>
-    <?php endif; ?>
-    </tbody>
-</table>
diff --git a/templates/table/search/fields_table.twig b/templates/table/search/fields_table.twig
new file mode 100644
index 0000000000..c2da41a687
--- /dev/null
+++ b/templates/table/search/fields_table.twig
@@ -0,0 +1,23 @@
+<table class="data"{{ search_type == 'zoom' ? ' id="tableFieldsId"' }}>
+    {% include 'table/search/table_header.twig' with {
+        'geom_column_flag': geom_column_flag
+    } only %}
+    <tbody>
+    {% if search_type == 'zoom' %}
+        {% include 'table/search/rows_zoom.twig' with {
+            'self': self,
+            'column_names': column_names,
+            'criteria_column_names': criteria_column_names,
+            'criteria_column_types': criteria_column_types
+        } only %}
+    {% else %}
+        {% include 'table/search/rows_normal.twig' with {
+            'self': self,
+            'geom_column_flag': geom_column_flag,
+            'column_names': column_names,
+            'column_types': column_types,
+            'column_collations': column_collations
+        } only %}
+    {% endif %}
+    </tbody>
+</table>
diff --git a/templates/table/search/selection_form.phtml b/templates/table/search/selection_form.phtml
index fed4060d75..792f266e89 100644
--- a/templates/table/search/selection_form.phtml
+++ b/templates/table/search/selection_form.phtml
@@ -33,11 +33,13 @@ switch ($searchType) {
             <?= PhpMyAdmin\Template::get('table/search/fields_table')
                 ->render(array(
                     'self' => $self,
-                    'searchType' => $searchType,
-                    'geomColumnFlag' => $geomColumnFlag,
-                    'columnNames' => $columnNames,
-                    'columnTypes' => $columnTypes,
-                    'columnCollations' => $columnCollations
+                    'search_type' => $searchType,
+                    'geom_column_flag' => $geomColumnFlag,
+                    'column_names' => $columnNames,
+                    'column_types' => $columnTypes,
+                    'column_collations' => $columnCollations,
+                    'criteria_column_names' => $_POST['criteriaColumnNames'],
+                    'criteria_column_types' => $_POST['criteriaColumnTypes'],
                 ))
             ?>
             <?= PhpMyAdmin\Template::get('table/search/options_zoom')
@@ -60,11 +62,13 @@ switch ($searchType) {
                 <?= PhpMyAdmin\Template::get('table/search/fields_table')
                 ->render(array(
                     'self' => $self,
-                    'searchType' => $searchType,
-                    'geomColumnFlag' => $geomColumnFlag,
-                    'columnNames' => $columnNames,
-                    'columnTypes' => $columnTypes,
-                    'columnCollations' => $columnCollations
+                    'search_type' => $searchType,
+                    'geom_column_flag' => $geomColumnFlag,
+                    'column_names' => $columnNames,
+                    'column_types' => $columnTypes,
+                    'column_collations' => $columnCollations,
+                    'criteria_column_names' => $_POST['criteriaColumnNames'],
+                    'criteria_column_types' => $_POST['criteriaColumnTypes'],
                 )); ?>
             </div>
             <div id="gis_editor">