diff --git a/templates/table/search/fields_table.phtml b/templates/table/search/fields_table.phtml
index 2d3d60986a..5176270b0e 100644
--- a/templates/table/search/fields_table.phtml
+++ b/templates/table/search/fields_table.phtml
@@ -16,10 +16,10 @@
         <?= PhpMyAdmin\Template::get('table/search/rows_normal')
             ->render(array(
                 'self' => $self,
-                'geomColumnFlag' => $geomColumnFlag,
-                'columnNames' => $columnNames,
-                'columnTypes' => $columnTypes,
-                'columnCollations' => $columnCollations
+                'geom_column_flag' => $geomColumnFlag,
+                'column_names' => $columnNames,
+                'column_types' => $columnTypes,
+                'column_collations' => $columnCollations
         )) ?>
     <?php endif; ?>
     </tbody>
diff --git a/templates/table/search/rows_normal.phtml b/templates/table/search/rows_normal.phtml
deleted file mode 100644
index d609144409..0000000000
--- a/templates/table/search/rows_normal.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-// for every column present in table
-for (
-    $column_index = 0, $nb = count($columnNames);
-    $column_index < $nb;
-    $column_index++
-): ?>
-    <tr class="noclick">
-        <!-- If 'Function' column is present trying to change comment -->
-        <?php if ($geomColumnFlag): ?>
-            <?= PhpMyAdmin\Template::get('table/search/geom_func')
-                ->render(array(
-                    'column_index' => $column_index,
-                    'column_types' => $columnTypes,
-                )); ?>
-        <?php endif; ?>
-        <!-- Displays column's name, type, collation and value -->
-        <th>
-            <?= htmlspecialchars($columnNames[$column_index]); ?>
-        </th>
-        <?php $properties = $self->getColumnProperties($column_index, $column_index); ?>
-        <td dir="ltr">
-            <?= htmlspecialchars($properties['type']); ?>
-        </td>
-        <td>
-            <?= $properties['collation']; ?>
-        </td>
-        <td>
-            <?= $properties['func']; ?>
-        </td>
-        <!-- here, the data-type attribute is needed for a date/time picker-->
-        <td data-type="<?= htmlspecialchars($properties['type']); ?>">
-            <?= $properties['value']; ?>
-            <!-- Displays hidden fields -->
-            <input type="hidden"
-                   name="criteriaColumnNames[<?= $column_index; ?>]"
-                   value="<?= htmlspecialchars($columnNames[$column_index]); ?>" />
-            <input type="hidden"
-                   name="criteriaColumnTypes[<?= $column_index; ?>]"
-                   value="<?= htmlspecialchars($columnTypes[$column_index]); ?>" />
-            <input type="hidden"
-                   name="criteriaColumnCollations[<?= $column_index; ?>]"
-                   value="<?= $columnCollations[$column_index]; ?>" />
-        </td>
-    </tr>
-<?php endfor; ?>
diff --git a/templates/table/search/rows_normal.twig b/templates/table/search/rows_normal.twig
new file mode 100644
index 0000000000..ee24abd6c1
--- /dev/null
+++ b/templates/table/search/rows_normal.twig
@@ -0,0 +1,39 @@
+{% for column_index in 0..column_names|length - 1 %}
+    <tr class="noclick">
+        {# If 'Function' column is present trying to change comment #}
+        {% if geom_column_flag %}
+            {% include 'table/search/geom_func.twig' with {
+                'column_index': column_index,
+                'column_types': column_types
+            } only %}
+        {% endif %}
+        {# Displays column's name, type, collation and value #}
+        <th>
+            {{ column_names[column_index] }}
+        </th>
+        {% set properties = self.getColumnProperties(column_index, column_index) %}
+        <td dir="ltr">
+            {{ properties['type'] }}
+        </td>
+        <td>
+            {{ properties['collation'] }}
+        </td>
+        <td>
+            {{ properties['func'] }}
+        </td>
+        {# here, the data-type attribute is needed for a date/time picker #}
+        <td data-type="{{ properties['type'] }}">
+            {{ properties['value'] }}
+            {# Displays hidden fields #}
+            <input type="hidden"
+                name="criteriaColumnNames[{{ column_index }}]"
+                value="{{ column_names[column_index] }}" />
+            <input type="hidden"
+                name="criteriaColumnTypes[{{ column_index }}]"
+                value="{{ column_types[column_index] }}" />
+            <input type="hidden"
+                name="criteriaColumnCollations[{{ column_index }}]"
+                value="{{ column_collations[column_index] }}" />
+        </td>
+    </tr>
+{% endfor %}