diff --git a/js/sql.js b/js/sql.js
index 41bfe5b85c..7c2b573988 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -1020,6 +1020,10 @@ Sql.initProfilingTables = function () {
     if (!$.tablesorter) {
         return;
     }
+    // Added to allow two direction sorting
+    $('#profiletable')
+        .find('thead th')
+        .off('click mousedown');
 
     $('#profiletable').tablesorter({
         widgets: ['zebra'],
@@ -1032,6 +1036,10 @@ Sql.initProfilingTables = function () {
             }
         }
     });
+    // Added to allow two direction sorting
+    $('#profilesummarytable')
+        .find('thead th')
+        .off('click mousedown');
 
     $('#profilesummarytable').tablesorter({
         widgets: ['zebra'],
diff --git a/templates/sql/profiling_chart.twig b/templates/sql/profiling_chart.twig
index 0f809541ea..5ad1ea84dc 100644
--- a/templates/sql/profiling_chart.twig
+++ b/templates/sql/profiling_chart.twig
@@ -11,7 +11,6 @@
         </th>
         <th>
           {% trans 'State' %}
-          {{ show_mysql_docu('general-thread-states') }}
           <div class="sorticon"></div>
         </th>
         <th>
@@ -27,13 +26,12 @@
   </div>
 
   <div class="floatleft">
-    <h3>{% trans 'Summary by state' %}</h3>
+    <h3>{% trans 'Summary by state' %}{{ show_mysql_docu('general-thread-states') }}</h3>
     <table id="profilesummarytable">
       <thead>
       <tr>
         <th>
           {% trans 'State' %}
-          {{ show_mysql_docu('general-thread-states') }}
           <div class="sorticon"></div>
         </th>
         <th>