diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index fc5a4b9d0a..014cd8df91 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -1098,30 +1098,16 @@ class Results
      * Prepare fields for table navigation
      * Number of rows
      *
-     * @param string $html_sql_query the sql encoded by htmlspecialchars()
+     * @param string $sqlQuery the sql encoded by htmlspecialchars()
      *
-     * @return  string  $additional_fields_html html content
+     * @return string html content
      *
      * @access  private
      *
      * @see     _getTableNavigation()
      */
-    private function _getAdditionalFieldsForTableNavigation(
-        $html_sql_query
-    ) {
-
-        $additional_fields_html = '';
-
-        $additional_fields_html .= '<input type="hidden" name="sql_query" '
-            . 'value="' . $html_sql_query . '" />'
-            . '<input type="hidden" name="goto" value="' . $this->__get('goto')
-            . '" />'
-            . '<input type="hidden" name="pos" size="3" value="'
-            // Do not change the position when changing the number of rows
-            . $_SESSION['tmpval']['pos'] . '" />'
-            . '<input type="hidden" name="is_browse_distinct" value="'
-            . $this->__get('is_browse_distinct') . '" />'  ;
-
+    private function _getAdditionalFieldsForTableNavigation($sqlQuery)
+    {
         $numberOfRowsPlaceholder = null;
         if ($_SESSION['tmpval']['max_rows'] == self::ALL_ROWS) {
             $numberOfRowsPlaceholder = __('All');
@@ -1134,17 +1120,17 @@ class Results
             '250' => 250,
             '500' => 500
         );
-        $additional_fields_html .= __('Number of rows:') . ' ';
-        $additional_fields_html .= Util::getDropdown(
-            'session_max_rows', $numberOfRowsChoices,
-            $_SESSION['tmpval']['max_rows'], '',
-            'autosubmit', $numberOfRowsPlaceholder
-        );
-
-        return $additional_fields_html;
-
-    } // end of the '_getAdditionalFieldsForTableNavigation()' function
 
+        return Template::get('display/results/additional_fields')->render([
+            'goto' => $this->__get('goto'),
+            'is_browse_distinct' => $this->__get('is_browse_distinct'),
+            'sql_query' => $sqlQuery,
+            'number_of_rows_choices' => $numberOfRowsChoices,
+            'number_of_rows_placeholder' => $numberOfRowsPlaceholder,
+            'pos' => $_SESSION['tmpval']['pos'],
+            'max_rows' => $_SESSION['tmpval']['max_rows'],
+        ]);
+    }
 
     /**
      * Get the headers of the results table, for all of the columns
diff --git a/templates/display/results/additional_fields.twig b/templates/display/results/additional_fields.twig
new file mode 100644
index 0000000000..745b3bbdcb
--- /dev/null
+++ b/templates/display/results/additional_fields.twig
@@ -0,0 +1,14 @@
+<input type="hidden" name="sql_query" value="{{ sql_query|raw }}" />
+<input type="hidden" name="goto" value="{{ goto }}" />
+{# Do not change the position when changing the number of rows #}
+<input type="hidden" name="pos" size="3" value="{{ pos }}" />
+<input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />
+{% trans 'Number of rows:' %}
+{{ Util_getDropdown(
+    'session_max_rows',
+    number_of_rows_choices,
+    max_rows,
+    '',
+    'autosubmit',
+    number_of_rows_placeholder
+) }}
diff --git a/templates/display/results/show_all_checkbox.twig b/templates/display/results/show_all_checkbox.twig
index ca740ce01f..b2674d3893 100644
--- a/templates/display/results/show_all_checkbox.twig
+++ b/templates/display/results/show_all_checkbox.twig
@@ -1,7 +1,7 @@
 <td>
     <form action="sql.php" method="post">
         {{ Url_getHiddenInputs(db, table) }}
-        <input type="hidden" name="sql_query" value="{{ html_sql_query }}" />
+        <input type="hidden" name="sql_query" value="{{ html_sql_query|raw }}" />
         <input type="hidden" name="pos" value="0" />
         <input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />
         <input type="hidden" name="session_max_rows" value="{{ not showing_all ? 'all' : max_rows }}" />