diff --git a/website/web/sri.txt b/website/web/sri.txt
index 9533aad0..4981d6eb 100644
--- a/website/web/sri.txt
+++ b/website/web/sri.txt
@@ -33,7 +33,7 @@
     "loader.gif": "ZZKD5vLSKBWKeUpa2KI9qheUJ49iTI/UULmVU/AX28fBfH00K3lLc2v5pVJZ4qXG1BbB13LTXzRKKU35H2XfNg==",
     "lookyloo.jpeg": "i6wBj8CsIM5YAQLEMQfhs3CNOSKkErF8AMqqM6ZygSwCyQgv9CU8xt94veMZhM/ufBWoz7kAXmR+yywmxsTxug==",
     "redirect.png": "PAjzlPV97rEFvH55mG1ZC9wRl98be3yMeX/nENuFkJcds6/AXgSR2ig/QyPULgobSnNgiYieLVWY/oqsgeywrQ==",
-    "render_tables.js": "dx/SKBsKQK/dKAUZbqO3+/4YllmCyVXLuEm0uGaWbI6U5RqysUKMDmKFhe0+YI4CfNZV6AtC4NDdsVCRiKD6kA==",
+    "render_tables.js": "IqsJ7pttDuNErMNbreMOceEY3A7u8NIPPjddWKSiGzwKAYNsoKY8Xm7pN/gjJG3ByuTazXC0CuUpHG9Tk+Z0IQ==",
     "secure.svg": "H8ni7t0d60nCJDVGuZpuxC+RBy/ipAjWT627D12HlZGg6LUmjSwPTQTUekm3UJupEP7TUkhXyq6WHc5gy7QBjg==",
     "stats.css": "/kY943FwWBTne4IIyf7iBROSfbGd82TeBicEXqKkRwawMVRIvM/Pk5MRa7okUyGIxaDjFQGmV/U1vy+PhN6Jbw==",
     "stats_graph.js": "S/sMNQK1UMMLD0xQeEa7sq3ce8o6oPxwxGlyKVtaHOODjair86dbBDm7cu6pa/elMRDJT1j09jEFjWp+5GbhTw==",
diff --git a/website/web/static/render_tables.js b/website/web/static/render_tables.js
index 295b560c..ec98c21d 100644
--- a/website/web/static/render_tables.js
+++ b/website/web/static/render_tables.js
@@ -6,6 +6,7 @@
       serverSide: true,
       retrieve: true,
       ordering: false,
+      searching: false,  // Needs to implement that serverside
       drawCallback: function (settings) { newTabClickListener() },
       ajax: {
           url: `/tables/HHHDetailsTable/${hhh}${window.location.search}`,
@@ -25,7 +26,8 @@
       serverSide: true,
       retrieve: true,
       ordering: false,
-	  drawCallback: function (settings) { newTabClickListener() },
+      searching: false,  // Needs to implement that serverside
+      drawCallback: function (settings) { newTabClickListener() },
       ajax: {
           url: `/tables/bodyHashDetailsTable/${bodyhash}${window.location.search}`,
           type: 'POST'
@@ -44,7 +46,8 @@
         serverSide: true,
         retrieve: true,
         ordering: false,
-		drawCallback: function (settings) { newTabClickListener() },
+        searching: false,  // Needs to implement that serverside
+        drawCallback: function (settings) { newTabClickListener() },
         ajax: {
             url: `/tables/hashTypeDetailsTable/${hash_value}${window.location.search}`,
             type: 'POST'
@@ -64,7 +67,8 @@
         serverSide: true,
         retrieve: true,
         ordering: false,
-		drawCallback: function (settings) { newTabClickListener() },
+        searching: false,  // Needs to implement that serverside
+        drawCallback: function (settings) { newTabClickListener() },
         ajax: {
             url: `/tables/identifierDetailsTable/${identifier_value}${window.location.search}`,
             type: 'POST'
@@ -79,23 +83,26 @@
   if (document.getElementById('bodyHashesTable')) {
       new DataTable('#bodyHashesTable', {
         retrieve: true,
-		drawCallback: function (settings) { newTabClickListener() },
+        ordering: false,
+        drawCallback: function (settings) {
+            newTabClickListener();
+            $('[data-bs-toggle="tooltip"]').tooltip({html: true});
+        },
         order: [[ 0, "desc" ]],
         columns: [{ width: '10%' },
-                  { width: '10%' },
+                  { width: '10%' }, // Would make sense to order on the file type
                   { width: '60%' },
                   { width: '20%' }],
-        initComplete: function (settings, json) {
-          $('[data-bs-toggle="tooltip"]').tooltip({html: true});
-        }
-      }).on('draw', function() {
-        $('[data-bs-toggle="tooltip"]').tooltip({html: true});
       });
   }
   if (document.getElementById('faviconsTable')) {
       new DataTable('#faviconsTable', {
         retrieve: true,
-		drawCallback: function (settings) { newTabClickListener(); downloadFaviconListener(); },
+        ordering: false,
+        drawCallback: function (settings) {
+            newTabClickListener();
+            downloadFaviconListener();
+        },
         columns: [{ width: '10%' },
                   { width: '40%' },
                   { width: '40%' },
@@ -103,33 +110,34 @@
       });
   }
   if (document.getElementById('treeHashesTable')) {
-    new DataTable('#treeHashesTable', {
-    retrieve: true,
-	drawCallback: function (settings) { newTabClickListener() },
-    column: [{ width: '20%' },
-             { width: '40%' },
-             { width: '40%' }],
-    });
+      new DataTable('#treeHashesTable', {
+        retrieve: true,
+        ordering: false,
+        drawCallback: function (settings) { newTabClickListener() },
+        column: [{ width: '20%' },
+                 { width: '40%' },
+                 { width: '40%' }],
+      });
   }
   if (document.getElementById('hostnamesTable')) {
       new DataTable('#hostnamesTable', {
-      retrieve: true,
-	  drawCallback: function (settings) { newTabClickListener() },
-      order: [[ 0, "desc" ]],
-      columns: [{ width: '10%' },
-                { width: '40%' },
-                { width: '50%' }],
-      initComplete: function (settings, json) {
-        $('[data-bs-toggle="tooltip"]').tooltip({html: true});
-      }
-    }).on('draw', function() {
-      $('[data-bs-toggle="tooltip"]').tooltip({html: true});
-    });
+        retrieve: true,
+        ordering: false,
+        drawCallback: function (settings) {
+            newTabClickListener();
+            $('[data-bs-toggle="tooltip"]').tooltip({html: true});
+        },
+        order: [[ 0, "desc" ]],
+        columns: [{ width: '10%' },
+                  { width: '40%' },
+                  { width: '50%' }],
+      });
   }
   if (document.getElementById('identifiersTable')) {
       new DataTable('#identifiersTable', {
         retrieve: true,
-		drawCallback: function (settings) { newTabClickListener() },
+        ordering: false,
+        drawCallback: function (settings) { newTabClickListener() },
         columns: [{ width: '20%' },
                   { width: '40%' },
                   { width: '40%' }],
@@ -138,7 +146,8 @@
   if (document.getElementById('urlsTable')) {
       new DataTable('#urlsTable', {
         retrieve: true,
-		drawCallback: function (settings) { newTabClickListener() },
+        ordering: false,
+        drawCallback: function (settings) { newTabClickListener() },
         order: [[ 0, "desc" ]],
         columns: [{ width: '10%' },
                   { width: '90%' }],
@@ -156,7 +165,8 @@
         serverSide: true,
         retrieve: true,
         ordering: false,
-		drawCallback: function (settings) { newTabClickListener() },
+        searching: false,  // Needs to implement that serverside
+        drawCallback: function (settings) { newTabClickListener() },
         ajax: {
             url: `/tables/cookieNameTable/${cookieName}${window.location.search}`,
             type: 'POST'
@@ -170,22 +180,23 @@
   }
 
   if (document.getElementById('hostnameTable')) {
-    hostname = document.getElementById('hostnameTable').dataset.hostname;
-    new DataTable('#hostnameTable', {
-      processing: true,
-      serverSide: true,
-      retrieve: true,
-      ordering: false,
-      drawCallback: function (settings) { newTabClickListener() },
-      ajax: {
-          url: `/tables/hostnameTable/${hostname}${window.location.search}`,
-          type: 'POST'
-      },
-      columns : [
-          { data: 'capture_time', width: '20%', render: DataTable.render.datetime_with_tz() },
-          { data: 'capture_title', width: '40%' },
-          { data: 'landing_page', width: '40%' }
-      ],
+      hostname = document.getElementById('hostnameTable').dataset.hostname;
+      new DataTable('#hostnameTable', {
+        processing: true,
+        serverSide: true,
+        retrieve: true,
+        ordering: false,
+        searching: false,  // Needs to implement that serverside
+        drawCallback: function (settings) { newTabClickListener() },
+        ajax: {
+           url: `/tables/hostnameTable/${hostname}${window.location.search}`,
+           type: 'POST'
+        },
+        columns : [
+           { data: 'capture_time', width: '20%', render: DataTable.render.datetime_with_tz() },
+           { data: 'capture_title', width: '40%' },
+           { data: 'landing_page', width: '40%' }
+        ],
     });
   }
 
@@ -196,7 +207,8 @@
         serverSide: true,
         retrieve: true,
         ordering: false,
-		drawCallback: function (settings) { newTabClickListener() },
+        searching: false,  // Needs to implement that serverside
+        drawCallback: function (settings) { newTabClickListener() },
         ajax: {
             url: `/tables/urlTable/${url}${window.location.search}`,
             type: 'POST'
@@ -210,22 +222,23 @@
   }
 
   if (document.getElementById('faviconDetailsTable')) {
-    favicon = document.getElementById('faviconDetailsTable').dataset.favicon;
-    new DataTable('#faviconDetailsTable', {
-      processing: true,
-      serverSide: true,
-      retrieve: true,
-      ordering: false,
-	  drawCallback: function (settings) { newTabClickListener() },
-      ajax: {
-          url: `/tables/faviconDetailsTable/${favicon}${window.location.search}`,
-          type: 'POST'
-      },
-      columns : [
-          { data: 'capture_time', width: '20%', render: DataTable.render.datetime_with_tz() },
-          { data: 'capture_title', width: '40%' },
-          { data: 'landing_page', width: '40%' }
-      ],
-    });
+      favicon = document.getElementById('faviconDetailsTable').dataset.favicon;
+      new DataTable('#faviconDetailsTable', {
+        processing: true,
+        serverSide: true,
+        retrieve: true,
+        ordering: false,
+        searching: false,  // Needs to implement that serverside
+        drawCallback: function (settings) { newTabClickListener() },
+        ajax: {
+           url: `/tables/faviconDetailsTable/${favicon}${window.location.search}`,
+           type: 'POST'
+        },
+        columns : [
+           { data: 'capture_time', width: '20%', render: DataTable.render.datetime_with_tz() },
+           { data: 'capture_title', width: '40%' },
+           { data: 'landing_page', width: '40%' }
+        ],
+      });
   }
 }));
diff --git a/website/web/templates/macros.html b/website/web/templates/macros.html
index bab8cedf..ceed83ed 100644
--- a/website/web/templates/macros.html
+++ b/website/web/templates/macros.html
@@ -244,15 +244,6 @@
 
 {% macro popup_icons_response(urlnode, tree_uuid) %}
 <div>
-  {% if urlnode.response_cookie %}
-    {% set icon_info = get_icon("response_cookie") %}
-    <a href="{{ url_for('urlnode_response_cookies', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}"
-       title="Download all the cookies in the response from the server">
-      <img src="{{ url_for('static', filename=icon_info['icon']) }}" alt="{{ icon_info['tooltip'] }}"
-           width="21" height="21"/>
-    </a>
-  {% endif %}
-
   {% if urlnode.generic_type in ["js", "exe", "css", "font", "html", "json", "image", "video",
                                  "unknown_mimetype", "text", "unset_mimetype", "octet-stream",
                                  "livestream"] %}
@@ -270,6 +261,15 @@
       />
     </a>
   {%endif%}
+  {% if urlnode.response_cookie %}
+    {% set icon_info = get_icon("response_cookie") %}
+    <a href="{{ url_for('urlnode_response_cookies', tree_uuid=tree_uuid, node_uuid=urlnode.uuid) }}"
+       title="Download all the cookies in the response from the server">
+      <img src="{{ url_for('static', filename=icon_info['icon']) }}" alt="{{ icon_info['tooltip'] }}"
+           width="21" height="21"/>
+    </a>
+  {% endif %}
+
 </div>
 
 <div>
diff --git a/website/web/templates/tree_body_hashes.html b/website/web/templates/tree_body_hashes.html
index 61f4ebe0..67fd9775 100644
--- a/website/web/templates/tree_body_hashes.html
+++ b/website/web/templates/tree_body_hashes.html
@@ -11,7 +11,6 @@
 </thead>
 <tbody>
   {% for body_hash, info in body_hashes.items() %}
-  {% set icon_info = get_icon(info['node'].generic_type) %}
   <tr>
     <td>{{ info['total_captures'] }}</td>
     <td>