diff --git a/conf/report/report-template.html b/conf/report/report-template.html
index b9fe401813184..d917d98756639 100644
--- a/conf/report/report-template.html
+++ b/conf/report/report-template.html
@@ -49,238 +49,100 @@
       tool_array = table.columns()[0];
       tool_array = tool_array.splice(2);
       col_array = table.columns()[0];
+      var filters = $('<div id="report_table_filter" class="dataTables_filter advanced_filter"><details><summary>Show advanced filters (experimental)</summary></details></div>').insertAfter(".dataTables_filter");
+      var section = $('<section id="filter"><ul class="filter-entries"></ul></section>').insertAfter("summary");
+      var add_buttons = $('<div><button class="filter-add" onclick="addOptions()">Add</button><button class="filter-apply" onclick="applyFilter()">Apply</button><button class="filter-remove" onclick="removeAll()">Remove all filters</button></div>').insertAfter("#filter");
     } );
 
     var iter;
-    var selected_tools = [];
-    var tools_relation;
-
-    const operator_from_string = {
-      '<': (a, b) => a < b,
-      '>': (a, b) => a > b,
-      '>=': (a, b) => a >= b,
-      '<=': (a, b) => a <= b,
-      '=': (a, b) => a === b
-    };
+    var global_relation;
+    var filter_expression;
 
     const relation_from_string = {
-      'and': (a, b) => a && b,
-      'or': (a, b) => a || b
-    }
-
-    function toggleFilters() {
-      var x = document.getElementById("filter");
-      if (x.style.display === "none") {
-        x.style.display = "block";
-      } else {
-        x.style.display = "none";
-      }
+      'is': '==',
+      'is not': '!=='
     }
 
     const filter_types = {
       coverage: {
         name: "Coverage",
-        operators: ["<", "<=", ">", ">=", "="],
-        value_field_factory: function(id, span_id=0) {
-          span_id = parseInt(span_id)
-          if ($(`li[data-uid=${id}] span[data-uid=${span_id+1}]`).length > 0)
-            $(`li[data-uid=${id}] span[data-uid=${span_id+1}]`).remove()
-          var iter = $(`li[data-uid=${id}] span`).length
-          if (iter === 0)
-            var filter_condition = $(`<span data-uid=${iter}></span>`).insertAfter(`li[data-uid=${id}] .filter-entry-type`)
-          else
-            var filter_condition = $(`<span data-uid=${iter}></span>`).insertAfter(`li[data-uid=${id}] span[data-uid=${iter-1}]`)
-          var filter_entry_operator =  $('<select class="filter-entry-operator"><option value=""></option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
-          var filter_entry_value =  $('<select class="filter-entry-value"><option value=""></option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
-          var filter_condition_options = $('<select onchange="filter_types.coverage.value_field_factory(this.parentElement.parentElement.dataset.uid, this.parentElement.dataset.uid)" class="filter-condition"><option value=""></option><option value="and">AND</option><option value="or">OR</option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
+        operators: ["<", "<=", ">", ">=", "=="],
+        value_field_factory: function(id) {
+          $(`li[data-uid=${id}] .filter-entry-operator`).remove();
+          $(`li[data-uid=${id}] .filter-entry-value`).remove();
+          var filter_entry_operator =  $('<select class="filter-entry-operator"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-type`);
+          var filter_entry_value =  $('<select class="filter-entry-value"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-operator`);
           for (var i=0; i<this.operators.length; i++)
-            $(`<option value="${this.operators[i]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] span[data-uid=${iter}] .filter-entry-operator`);
+            $(`<option value="${this.operators[i]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
           for (var i=0; i<=100; i++)
-            $(`<option value="${i}">${i}</option>`).appendTo(`li[data-uid=${id}] span[data-uid=${iter}] .filter-entry-value`);
-        },
-        apply: function(operator1, percentage1, operator2, percentage2, relation) {
-          var values = new Set();
-          if (typeof relation == 'undefined') {
-            table.columns().every(function() {
-              var column = this;
-              if(column.index() !== 0 && column.index() !== 1) {
-                percentage = parseInt(percentage1);
-                column.data().each(function(d, j) {
-                  output = d.split('/');
-                  tests_passed = output[0];
-                  total_tests = output[1];
-                  coverage = parseInt((tests_passed/total_tests)*100);
-                  if ((operator1 in operator_from_string) && operator_from_string[operator1](coverage, percentage))
-                    values.add(d);
-                });
-              }
-            });
-          }
-          else {
-            table.columns().every(function() {
-              var column = this;
-              if(column.index() !== 0 && column.index() !== 1) {
-                percentage1 = parseInt(percentage1);
-                percentage2 = parseInt(percentage2);
-                column.data().each(function(d, j) {
-                  output = d.split('/');
-                  tests_passed = output[0];
-                  total_tests = output[1];
-                  coverage = parseInt((tests_passed/total_tests)*100);
-                  const result_left = operator_from_string[operator1](coverage, percentage1);
-                  const result_right = operator_from_string[operator2](coverage, percentage2);
-                  const result = relation_from_string[relation](result_left, result_right);
-                  if (result)
-                    values.add(d);
-                });
-              }
-            });
-          }
-          values = [...values];
-          if (selected_tools.length === 0){
-            table.columns(col_array).every(function() {
-              $.fn.dataTable.ext.search.push(
-                function(settings, searchData, index, rowData, counter) {
-                  for(var i=0; i<col_array.length; i++){
-                    if(values.includes(searchData[col_array[i]]))
-                      return true;
-                  }
-              });
-            });
-          }
-          else {
-            table.columns(selected_tools).every(function() {
-              if (tool_relation !== 'and'){
-                $.fn.dataTable.ext.search.push(
-                  function(settings, searchData, index, rowData, counter) {
-                    for(var i=0; i<selected_tools.length; i++){
-                      if(values.includes(searchData[selected_tools[i]]))
-                        return true;
-                    }
-                });
-              }
-              else if (tool_relation === 'and'){
-                regex = [];
-                for (var i=0; i<values.length; i++){
-                  value = "^"+values[i]+"$";
-                  regex.push(value);
-                }
-                regex = regex.join("|");
-                table.columns(selected_tools).search(regex, true, false, true).draw();
-              }
-            });
-          }
-          table.draw();
+            $(`<option value="${i}">${i}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-value`);
         }
       },
       type: {
         name: "Type",
         operators: ["is", "is not"],
         types: ["parsing", "preprocessing", "simulation"],
-        value_field_factory: function(id, span_id=0) {
-          span_id = parseInt(span_id)
-          if ($(`li[data-uid=${id}] span[data-uid=${span_id+1}]`).length > 0)
-            $(`li[data-uid=${id}] span[data-uid=${span_id+1}]`).remove()
-          var iter = $(`li[data-uid=${id}] span`).length
-          if (iter === 0)
-            var filter_condition = $(`<span data-uid=${iter}></span>`).insertAfter(`li[data-uid=${id}] .filter-entry-type`)
-          else
-            var filter_condition = $(`<span data-uid=${iter}></span>`).insertAfter(`li[data-uid=${id}] span[data-uid=${iter-1}]`)
-          var filter_entry_operator =  $('<select class="filter-entry-operator"><option value=""></option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
-          var filter_entry_value =  $('<select class="filter-entry-value"><option value=""></option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
-          var filter_condition_options = $('<select onchange="filter_types.type.value_field_factory(this.parentElement.parentElement.dataset.uid, this.parentElement.dataset.uid)" class="filter-condition"><option value=""></option><option value="and">AND</option><option value="or">OR</option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
+        value_field_factory: function(id) {
+          $(`li[data-uid=${id}] .filter-entry-operator`).remove();
+          $(`li[data-uid=${id}] .filter-entry-value`).remove();
+          var filter_entry_operator =  $('<select class="filter-entry-operator"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-type`);
+          var filter_entry_value =  $('<select class="filter-entry-value"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-operator`);
           for (var i=0; i<this.operators.length; i++)
-            $(`<option value="${this.operators[i]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] span[data-uid=${iter}] .filter-entry-operator`);
+            $(`<option value="${relation_from_string[this.operators[i]]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
           for (var i=0; i<this.types.length; i++)
-            $(`<option value="${this.types[i]}">${this.types[i]}</option>`).appendTo(`li[data-uid=${id}] span[data-uid=${iter}] .filter-entry-value`);
-        },
-        apply: function(operator1, type1, operator2, type2, relation) {
-          if (typeof relation == 'undefined'){
-            $.fn.dataTable.ext.search.push(
-              function(settings, data, dataIndex){
-                if (operator1 === 'is')
-                  return $(table.row(dataIndex).node()).hasClass(type1);
-                else if (operator1 === 'is not')
-                  return !$(table.row(dataIndex).node()).hasClass(type1);
-              });
-          }
-          else {
-            $.fn.dataTable.ext.search.push(
-              function(settings, data, dataIndex){
-                if (relation === 'and'){
-                  if (operator1 === 'is' && operator2 === 'is')
-                    return (($(table.row(dataIndex).node()).hasClass(type1)) && ($(table.row(dataIndex).node()).hasClass(type2)));
-                  else if (operator1 === 'is' && operator2 === 'is not')
-                  return (($(table.row(dataIndex).node()).hasClass(type1)) && (!$(table.row(dataIndex).node()).hasClass(type2)));
-                  else if (operator1 === 'is not' && operator2 === 'is')
-                  return ((!$(table.row(dataIndex).node()).hasClass(type1)) && ($(table.row(dataIndex).node()).hasClass(type2)));
-                  else if (operator1 === 'is not' && operator2 === 'is not')
-                  return ((!$(table.row(dataIndex).node()).hasClass(type1)) && (!$(table.row(dataIndex).node()).hasClass(type2)));
-                }
-                else if (relation === 'or'){
-                  if (operator1 === 'is' && operator2 === 'is')
-                    return (($(table.row(dataIndex).node()).hasClass(type1)) || ($(table.row(dataIndex).node()).hasClass(type2)));
-                  else if (operator1 === 'is' && operator2 === 'is not')
-                  return (($(table.row(dataIndex).node()).hasClass(type1)) || (!$(table.row(dataIndex).node()).hasClass(type2)));
-                  else if (operator1 === 'is not' && operator2 === 'is')
-                  return ((!$(table.row(dataIndex).node()).hasClass(type1)) || ($(table.row(dataIndex).node()).hasClass(type2)));
-                  else if (operator1 === 'is not' && operator2 === 'is not')
-                  return ((!$(table.row(dataIndex).node()).hasClass(type1)) || (!$(table.row(dataIndex).node()).hasClass(type2)));
-                }
-              }
-            );
-          }
-          table.draw();
+            $(`<option value="${this.types[i]}">${this.types[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-value`);
         }
       },
       tool: {
         name: "Tool",
         operators: ["is", "is not"],
         tools: toolnames,
-        value_field_factory: function(id, span_id=0) {
-          span_id = parseInt(span_id)
-          if ($(`li[data-uid=${id}] span[data-uid=${span_id+1}]`).length > 0)
-            $(`li[data-uid=${id}] span[data-uid=${span_id+1}]`).remove()
-          var iter = $(`li[data-uid=${id}] span`).length
-          if (iter === 0)
-            var filter_condition = $(`<span data-uid=${iter}></span>`).insertAfter(`li[data-uid=${id}] .filter-entry-type`)
-          else
-            var filter_condition = $(`<span data-uid=${iter}></span>`).insertAfter(`li[data-uid=${id}] span[data-uid=${iter-1}]`)
-          var filter_entry_operator =  $('<select class="filter-entry-operator"><option value=""></option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
-          var filter_entry_value =  $('<select class="filter-entry-value"><option value=""></option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
-          var filter_condition_options = $('<select onchange="filter_types.tool.value_field_factory(this.parentElement.parentElement.dataset.uid, this.parentElement.dataset.uid)" class="filter-condition"><option value=""></option><option value="and">AND</option><option value="or">OR</option></select>').appendTo(`li[data-uid=${id}] span[data-uid=${iter}]`)
+        value_field_factory: function(id) {
+          $(`li[data-uid=${id}] .filter-entry-operator`).remove();
+          $(`li[data-uid=${id}] .filter-entry-value`).remove();
+          var filter_entry_operator =  $('<select class="filter-entry-operator"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-type`);
+          var filter_entry_value =  $('<select class="filter-entry-value"><option value=""></option></select>').insertAfter(`li[data-uid=${id}] .filter-entry-operator`);
           for (var i=0; i<this.operators.length; i++)
-            $(`<option value="${this.operators[i]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] span[data-uid=${iter}] .filter-entry-operator`);
+            $(`<option value="${relation_from_string[this.operators[i]]}">${this.operators[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-operator`);
           for (var i=0; i<this.tools.length; i++)
-            $(`<option value="${this.tools[i]}">${this.tools[i]}</option>`).appendTo(`li[data-uid=${id}] span[data-uid=${iter}] .filter-entry-value`);
-        },
-        apply: function(operator, tool) {
-          table.columns(col_array).visible(true);
-          table.columns(tool_array).every(function() {
-            var column = this;
-            if(column.index() !== 0 && column.index() !== 1){
-              var theadname = column.header().textContent.trim();
-              if(operator === 'is'){
-                if(theadname === tool){
-                  var index = tool_array.indexOf(column.index());
-                  tool_array.splice(index, 1);
-                  selected_tools.push(column.index());
-                }
-              }
-              else if(operator === 'is not'){
-                if(theadname !== tool){
-                  var index = tool_array.indexOf(column.index());
-                  tool_array.splice(index, 1);
-                  selected_tools.push(column.index());
-                }
-              }
-            }
-          });
-          table.columns(tool_array).visible(false);
+            $(`<option value="${this.tools[i]}">${this.tools[i]}</option>`).appendTo(`li[data-uid=${id}] .filter-entry-value`);
         }
       }
     }
 
+    const global_relation_string = {
+      'and': ' && ',
+      'or': ' || '
+    }
+
+    function string_builder(applied_filters) {
+      var query = [];
+      global_relation = $('.global-relation').val();
+      $('.filter-entries').find('li').each(function(){
+        var expression = $(this).find('.filter-entry-type').val() + $(this).find('.filter-entry-operator').val() +  "\"" + $(this).find('.filter-entry-value').val() +  "\"";
+        query.push(expression);
+      });
+      return query.join(global_relation_string[global_relation]);
+    }
+
+    function search_function() {
+      const filter_cell = eval('(coverage, tool, type) => (' + filter_expression + ')')
+      $.fn.dataTable.ext.search.push(
+        function(settings, searchData, index, rowData, counter){
+          for(var i=2; i<col_array.length; i++){
+            var coverage, tool, types;
+            coverage = rowData[i]['@data-order'];
+            tool = rowData[i]['@data-search'].split(' ')[0];
+            types = rowData[i]['@data-search'].split(' ');
+            types.shift();
+            result = filter_cell(coverage, tool, type);
+            if(result)
+              return true;
+          } 
+      });
+      table.draw();
+    }
+
     function entryChanged(mode, id) {
       $(`li[data-uid=${id}] span`).remove();
       filter_types[mode].value_field_factory(id);
@@ -297,34 +159,8 @@
       $.fn.dataTable.ext.search.pop();
       table.draw();
       $('.filter-remove').show();
-      var applied_filters = [];
-      $('.filter-entries').find('li').each(function(){
-        var object = {};
-        object['filter'] = $(this).find('.filter-entry-type').val();
-        if (object['filter'] === 'tool')
-          object['priority'] = 1
-        else
-          object['priority'] = 0
-        $(this).find('span').each(function(index){
-          var span = {};
-          span['relation'] = $(this).find('.filter-condition').val();
-          span['operator'] = $(this).find('.filter-entry-operator').val();
-          span['value'] = $(this).find('.filter-entry-value').val();
-          object[index] = span;
-        });
-        applied_filters.push(object);
-      });
-      applied_filters.sort((a, b) => (a.priority < b.priority) ? 1 : -1);
-      for(const key in applied_filters){
-        if (applied_filters[key]['filter'] === 'tool')
-          tool_relation = applied_filters[key][0]['relation'];
-        if (applied_filters[key]['filter'] !== 'tool' && (Object.keys(applied_filters[key]).length-2 === 2))
-          filter_types[applied_filters[key]['filter']].apply(applied_filters[key][0]['operator'], applied_filters[key][0]['value'], applied_filters[key][1]['operator'], applied_filters[key][1]['value'], applied_filters[key][0]['relation']);
-        else {
-        for (var i=0; i<Object.keys(applied_filters[key]).length-2; i++)
-          filter_types[applied_filters[key]['filter']].apply(applied_filters[key][i]['operator'], applied_filters[key][i]['value']);
-        }
-      }
+      filter_expression = string_builder();
+      search_function();
     }
 
     function removeAll() {
@@ -352,6 +188,9 @@
     }
 
     function addOptions() {
+      if (document.getElementsByClassName('filter-entries')[0].childElementCount >= 1 && document.getElementsByClassName('global-relation').length == 0){
+        var global_relation = $('<select class="global-relation"><option value=""></option><option value="and">AND</option><option value="or">OR</option></select>').insertAfter("#filter");
+      }
       iter = $('.filter-entries').children('li').length;
       if(iter === 0)
         $('.filter-apply').show();
@@ -375,16 +214,6 @@
   <body>
     <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Tests</a></h1>
     <p class="headline"><a href="https://github.com/chipsalliance/sv-tests"><em>Test suite to check compliance with the SystemVerilog LRM by chapter as well as some real-world cores and test-cases.</em></a></p>
-    <button onclick="toggleFilters()">Show advanced filters (experimental)</button>
-    <section style="display: none;" id="filter">
-      <ul class="filter-entries">
-      </ul>
-      <div>
-        <button class="filter-add" onclick="addOptions()">Add</button>
-        <button class="filter-apply" onclick="applyFilter()">Apply</button>
-        <button class="filter-remove" onclick="removeAll()">Remove all filters</button>
-      </div>
-    </section>
     <table id="report_table">
       <thead>
         <tr class="fixed_header">
@@ -398,15 +227,7 @@ <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Test
         </tr>
       </thead>
         {% for tag, info in database.items() %}
-          {% set list = [] %}
-          {% for tool, tooldata in report|dictsort %}
-            {% for type in tooldata["tags"][tag]["type"] %}
-              {% if type not in list %}
-                {% set list = list.append(type) %}
-              {% endif %}
-            {% endfor %}
-          {% endfor %}
-          <tr class="{{list|join(" ")}}">
+          <tr>
           <th class="report_table_info" title="{{info}}">
             {% if tag in database_urls %}
             <a class="tag_link" target=_blank href="{{database_urls[tag]}}"> {{ info }} </a>
@@ -416,15 +237,18 @@ <h1 class="headline"><a href="https://github.com/chipsalliance/sv-tests">SV-Test
           </th>
           <th class="report_table_tag" title="{{info}}"> {{ tag }} </th>
           {% for tool, tooldata in report|dictsort %}
-          <th class="report_table_result {{ tooldata["tags"][tag]["status"] }}
-            {% if "test-na" not in tooldata["tags"][tag]["status"] %} test-cell {% endif %}"
+          <th class="report_table_result {{ tooldata["tags"][tag]["status"] }}{% if "test-na" not in tooldata["tags"][tag]["status"] %} test-cell {% endif %}"
+            {% set celldata = tool.lower() ~ " " ~ tooldata["tags"][tag]["type"]|join(" ") %}
+            data-search='{{celldata}}'
             {% if "test-varied" in tooldata["tags"][tag]["status"] %} style='background-size: {{'%0.0f' | format(100.0 * tooldata["tags"][tag]["passed-num"] / tooldata["tags"][tag]["logs"]|length) }}% 100%' {% endif %}
             {% if "test-na" not in tooldata["tags"][tag]["status"] %}
             id='{{tool}}-{{tag}}-cell'
-            onclick='toggleLog("{{tool}}", "{{tag}}",
-                               "{{tooldata["tags"][tag]["logs"][tooldata["tags"][tag]["head_test"]]["name"]}}")'
+            data-order='{{ '%0.0f' | format(100.0 * tooldata["tags"][tag]["passed-num"] / tooldata["tags"][tag]["logs"]|length) }}'
+            onclick='toggleLog("{{tool}}", "{{tag}}", "{{tooldata["tags"][tag]["logs"][tooldata["tags"][tag]["head_test"]]["name"]}}")'
             {% endif %}
-          >
+            {% if "test-na" in tooldata["tags"][tag]["status"] %}
+            data-order=" "
+            {% endif %}>
             {% if "test-na" not in tooldata["tags"][tag]["status"] %}
             {{ tooldata["tags"][tag]["passed-num"] }}/{{ tooldata["tags"][tag]["logs"]|length }}
             {% endif %}
diff --git a/conf/report/report.css b/conf/report/report.css
index 0786186b231c3..2398acb26e976 100644
--- a/conf/report/report.css
+++ b/conf/report/report.css
@@ -22,6 +22,14 @@ body {
   height: 150px;
 }
 
+.advanced_filter {
+  padding-top: 20px;
+}
+
+section > ul.filter-entries {
+  list-style-type: none;
+}
+
 .report_table_info, .col_header1 {
   position: sticky;
   left: 0;