diff --git a/web/admin/js/nro.js b/web/admin/js/nro.js
index f0e67b1da..f3e4f65ec 100644
--- a/web/admin/js/nro.js
+++ b/web/admin/js/nro.js
@@ -20,15 +20,15 @@
 
 /* various jquery scripts for the NRO admin page */
 
-function row_filter(table) {
-    var linked = table.find('[id^="unlinked_ck_"]').is(':checked');
-    var broken_cert = table.find('[id^="brokencert_ck_"]').is(':checked');
-    var or_warn = table.find('[id^="or_ck_"]').is(':checked');
-    var profile_warn = table.find('[id^="profile_ck_"]').is(':checked');
-    var input = table.find('[id^="qsearch_"]').val().toLowerCase();
+function row_filter(tbody) {
+    var linked = tbody.find('[id^="unlinked_ck_"]').is(':checked');
+    var broken_cert = tbody.find('[id^="brokencert_ck_"]').is(':checked');
+    var or_warn = tbody.find('[id^="or_ck_"]').is(':checked');
+    var profile_warn = tbody.find('[id^="profile_ck_"]').is(':checked');
+    var input = tbody.find('[id^="qsearch_"]').val().toLowerCase();
     var tr_visible;
     var inp_found;
-    table.children("tr.idp_tr").each(function() {
+    tbody.children("tr.idp_tr").each(function() {
         tr_visible = true;
         if (linked && $(this).hasClass('linked')) {
             tr_visible = false;
@@ -48,7 +48,6 @@ function row_filter(table) {
                 tr_visible = false;
             }
         }
-        
         if (tr_visible) {
             $(this).show();
         } else {
@@ -57,6 +56,11 @@ function row_filter(table) {
     });
 }
 
+function filter_action() {
+    var this_tbody = $(this).parent().parent().parent();
+    row_filter(this_tbody);
+}
+
 $(document).ready(function() {
     // realm diagnostics
     $("#realmcheck").on('click', function() {
@@ -88,16 +92,10 @@ $(document).ready(function() {
 
     // handler for the text filter (must take into account possible filtering 
     // on linked status
-    $('[id^="qsearch_"]').keyup(function() {
-        var this_table = $(this).parent().parent().parent();
-        row_filter(this_table);
-    });
+    $('[id^="qsearch_"]').keyup(filter_action);
 
     // the linked filter checkbox handler
-    $(":checkbox").on('click', function() {
-        var this_table = $(this).parent().parent().parent();
-        row_filter(this_table);
-    });
+    $(":checkbox").on('click', filter_action);
     
     $("#fed_selection").on('change', function() {
         fed = $("#fed_selection option:selected").val();
@@ -109,12 +107,12 @@ $(document).ready(function() {
         document.location.href = "overview_federation.php?fed_id="+fed;
     });
     
-    
     $("img.cat-icon").tooltip();
-    
     $("#loading_gif").hide();
-
+    $("tbody.fedlist").each(function() {
+        row_filter($(this));
+    });
 });
 
 
-    
\ No newline at end of file
+    
diff --git a/web/admin/overview_federation.php b/web/admin/overview_federation.php
index 351aa46c2..ada1eefd6 100644
--- a/web/admin/overview_federation.php
+++ b/web/admin/overview_federation.php
@@ -314,6 +314,7 @@
             $thefed = new \core\Federation($fedId);
             /// nomenclature for 'federation', federation name, nomenclature for 'inst'
             echo "<tr><td colspan='9'><strong>".sprintf(_("The following %s are in your %s %s:"), $uiElements->nomenclatureParticipant, $uiElements->nomenclatureFed, '<span style="color:green">'.$thefed->name.'</span>')."</strong></td></tr>";
+            echo "<tbody class='fedlist'>";
             echo "<tr><td colspan='1'><strong>". _("Quick search:")." </strong><input style='background:#eeeeee;' type='text' id='qsearch_".$fedId."'></td>";
             echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='profilecheck' id='profile_ck_".$fedId."'></td>";
             echo "<td style='border-bottom-style: dotted;border-bottom-width: 1px;'><input type='checkbox' name='orcheck' id='or_ck_".$fedId."'></td>";
@@ -498,6 +499,7 @@
                     }
                 }
             }
+            echo "</tbody>";
         }
         ?>
     </table>