diff --git a/templates/database/structure/browse_table.twig b/templates/database/structure/browse_table.twig
index 9d3ad64022..826a599ef7 100644
--- a/templates/database/structure/browse_table.twig
+++ b/templates/database/structure/browse_table.twig
@@ -1,3 +1,3 @@
-<a href="sql.php{{ tbl_url_query }}&amp;pos=0">
+<a href="sql.php{{ tbl_url_query|raw }}&amp;pos=0">
     {{ title|raw }}
 </a>
diff --git a/templates/database/structure/browse_table_label.twig b/templates/database/structure/browse_table_label.twig
index 3a024929d6..5cb861797b 100644
--- a/templates/database/structure/browse_table_label.twig
+++ b/templates/database/structure/browse_table_label.twig
@@ -1,3 +1,3 @@
-<a href="sql.php{{ tbl_url_query }}&amp;pos=0" title="{{ title }}">
+<a href="sql.php{{ tbl_url_query|raw }}&amp;pos=0" title="{{ title }}">
     {{ truename }}
 </a>
diff --git a/templates/database/structure/empty_table.twig b/templates/database/structure/empty_table.twig
index aab917576f..1af5aa8d44 100644
--- a/templates/database/structure/empty_table.twig
+++ b/templates/database/structure/empty_table.twig
@@ -1,4 +1,4 @@
-<a class="truncate_table_anchor ajax" href="sql.php{{ tbl_url_query }}&amp;sql_query=
+<a class="truncate_table_anchor ajax" href="sql.php{{ tbl_url_query|raw }}&amp;sql_query=
 {{- sql_query }}&amp;message_to_show={{ message_to_show }}">
     {{ title|raw }}
 </a>
diff --git a/templates/database/structure/search_table.twig b/templates/database/structure/search_table.twig
index 8c358d39e9..0bc2892ae0 100644
--- a/templates/database/structure/search_table.twig
+++ b/templates/database/structure/search_table.twig
@@ -1,3 +1,3 @@
-<a href="tbl_select.php{{ tbl_url_query }}">
+<a href="tbl_select.php{{ tbl_url_query|raw }}">
     {{ title|raw }}
 </a>