diff --git a/libraries/classes/Controllers/Database/DatabaseStructureController.php b/libraries/classes/Controllers/Database/DatabaseStructureController.php
index a7be69c2d4..ee94750bc2 100644
--- a/libraries/classes/Controllers/Database/DatabaseStructureController.php
+++ b/libraries/classes/Controllers/Database/DatabaseStructureController.php
@@ -659,6 +659,8 @@ class DatabaseStructureController extends DatabaseController
                 Template::get('database/structure/structure_table_row')
                     ->render(
                         array(
+                            'table_name_hash'       => md5($current_table['TABLE_NAME']),
+                            'db_table_name_hash'    => md5($this->db . '.' . $current_table['TABLE_NAME']),
                             'db'                    => $this->db,
                             'curr'                  => $i,
                             'input_class'           => implode(' ', $input_class),
diff --git a/libraries/classes/Controllers/Table/TableRelationController.php b/libraries/classes/Controllers/Table/TableRelationController.php
index 3c668b24a0..7e4fd2d471 100644
--- a/libraries/classes/Controllers/Table/TableRelationController.php
+++ b/libraries/classes/Controllers/Table/TableRelationController.php
@@ -189,6 +189,7 @@ class TableRelationController extends TableController
                 || ! empty($column['Key'])
             ) {
                 $column_array[$column['Field']] = $column['Field'];
+                $column_array[$column['Field'] . '_hash'] = md5($column['Field']);
             }
         }
         if ($GLOBALS['cfg']['NaturalOrder']) {
diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php
index c0036cb5f0..65c8799d87 100644
--- a/libraries/classes/Controllers/Table/TableSearchController.php
+++ b/libraries/classes/Controllers/Table/TableSearchController.php
@@ -371,11 +371,18 @@ class TableSearchController extends TableController
                 __('Browse foreign values')
             )
         );
+        $column_names_hashes = [];
+
+        foreach ($this->_columnNames as $columnName) {
+            $column_names_hashes[$columnName] = md5($columnName);
+        }
+
         $this->response->addHTML(
             Template::get('table/search/zoom_result_form')->render([
                 'db' => $this->db,
                 'table' => $this->table,
                 'column_names' => $this->_columnNames,
+                'column_names_hashes' => $column_names_hashes,
                 'foreigners' => $this->_foreigners,
                 'column_null_flags' => $this->_columnNullFlags,
                 'column_types' => $this->_columnTypes,
diff --git a/libraries/classes/Twig/PhpFunctionsExtension.php b/libraries/classes/Twig/PhpFunctionsExtension.php
index 08f823270e..ac3cabcf2a 100644
--- a/libraries/classes/Twig/PhpFunctionsExtension.php
+++ b/libraries/classes/Twig/PhpFunctionsExtension.php
@@ -30,7 +30,6 @@ class PhpFunctionsExtension extends AbstractExtension
             new TwigFunction('array_search', 'array_search'),
             new TwigFunction('bin2hex', 'bin2hex'),
             new TwigFunction('htmlentities', 'htmlentities'),
-            new TwigFunction('md5', 'md5'),
             new TwigFunction('preg_quote', 'preg_quote'),
             new TwigFunction('preg_replace', 'preg_replace'),
             new TwigFunction('strpos', 'strpos'),
diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig
index c1177c9ef9..13b0aee0dd 100644
--- a/templates/database/structure/structure_table_row.twig
+++ b/templates/database/structure/structure_table_row.twig
@@ -28,8 +28,8 @@
                 ((already_favorite ? 'remove' : 'add') ~ '_favorite'): true
             } %}
             {% include 'database/structure/favorite_anchor.twig' with {
-                'table_name_hash': md5(current_table['TABLE_NAME']),
-                'db_table_name_hash': md5(db ~ '.' ~ current_table['TABLE_NAME']),
+                'table_name_hash': table_name_hash,
+                'db_table_name_hash': db_table_name_hash,
                 'fav_params': fav_params,
                 'already_favorite': already_favorite,
                 'titles': titles
@@ -184,28 +184,6 @@
         {% endif %}
 
     {% else %}
-        {% set count = 0 %}
-        {% if properties_num_columns %}
-            {% set count = count + 2 %}
-        {% endif %}
-        {% if is_show_stats %}
-            {% set count = count + 2 %}
-        {% endif %}
-        {% if show_charset %}
-            {% set count = count + 1 %}
-        {% endif %}
-        {% if show_comment %}
-            {% set count = count + 1 %}
-        {% endif %}
-        {% if show_creation %}
-            {% set count = count + 1 %}
-        {% endif %}
-        {% if show_last_update %}
-            {% set count = count + 1 %}
-        {% endif %}
-        {% if show_last_check %}
-            {% set count = count + 1 %}
-        {% endif %}
 
         {% if db_is_system_schema %}
             {% set action_colspan = 3 %}
diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig
index 8dd30698b8..8b8393bada 100644
--- a/templates/table/relation/common_form.twig
+++ b/templates/table/relation/common_form.twig
@@ -117,7 +117,7 @@
                         {% set myfield = save_row[i]['Field'] %}
                         {# Use an md5 as array index to avoid having special characters
                            in the name attribute (see bug #1746964 ) #}
-                        {% set myfield_md5 = md5(myfield) %}
+                        {% set myfield_md5 = column_array[myfield ~ '_hash'] %}
 
                         {% set foreign_table = false %}
                         {% set foreign_column = false %}
diff --git a/templates/table/search/zoom_result_form.twig b/templates/table/search/zoom_result_form.twig
index d76ae19a46..f473e470e0 100644
--- a/templates/table/search/zoom_result_form.twig
+++ b/templates/table/search/zoom_result_form.twig
@@ -65,7 +65,7 @@
                                 'in_zoom_search_edit': true,
                                 'foreigners': foreigners,
                                 'column_name': field_popup,
-                                'column_name_hash': md5(field_popup),
+                                'column_name_hash': column_name_hashes[field_popup],
                                 'foreign_data': foreign_data,
                                 'table': table,
                                 'column_index': column_index,