diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js
index 12e5f5d26b..689a9622d9 100644
--- a/src/sunstone/public/js/plugins/acls-tab.js
+++ b/src/sunstone/public/js/plugins/acls-tab.js
@@ -614,9 +614,9 @@ $(document).ready(function(){
       dataTable_acls.fnFilter( $(this).val() );
     })
 
-    //addElement([
-    //    spinner,
-    //    '','','','','',''],dataTable_acls);
+    dataTable_acls.on('draw', function(){
+      recountCheckboxes(dataTable_acls);
+    })
 
     Sunstone.runAction("Acl.list");
 
diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js
index 97fc34c4ea..cfa2937c9d 100644
--- a/src/sunstone/public/js/plugins/clusters-tab.js
+++ b/src/sunstone/public/js/plugins/clusters-tab.js
@@ -1421,6 +1421,10 @@ $(document).ready(function(){
       dataTable_clusters.fnFilter( $(this).val() );
     })
 
+    dataTable_clusters.on('draw', function(){
+      recountCheckboxes(dataTable_clusters);
+    })
+
     Sunstone.runAction("Cluster.list");
 
     dialogs_context.append('<div title=\"'+tr("Create cluster")+'\" id="create_cluster_dialog"></div>');
diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js
index 827fd32807..5fee9d8787 100644
--- a/src/sunstone/public/js/plugins/datastores-tab.js
+++ b/src/sunstone/public/js/plugins/datastores-tab.js
@@ -1117,6 +1117,10 @@ $(document).ready(function(){
       dataTable_datastores.fnFilter( $(this).val() );
     })
 
+    dataTable_datastores.on('draw', function(){
+      recountCheckboxes(dataTable_datastores);
+    })
+
     Sunstone.runAction("Datastore.list");
 
     setupCreateDatastoreDialog();
diff --git a/src/sunstone/public/js/plugins/files-tab.js b/src/sunstone/public/js/plugins/files-tab.js
index d63db07452..6737248253 100644
--- a/src/sunstone/public/js/plugins/files-tab.js
+++ b/src/sunstone/public/js/plugins/files-tab.js
@@ -982,9 +982,10 @@ $(document).ready(function(){
       dataTable_files.fnFilter( $(this).val() );
     })
 
-    //addElement([
-    //    spinner,
-    //    '','','','','','','','','','','',''],dataTable_files);
+    dataTable_files.on('draw', function(){
+      recountCheckboxes(dataTable_files);
+    })
+
     Sunstone.runAction("File.list");
 
     setupCreateFileDialog();
diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js
index 47bb7948a9..4ab6400285 100644
--- a/src/sunstone/public/js/plugins/groups-tab.js
+++ b/src/sunstone/public/js/plugins/groups-tab.js
@@ -618,13 +618,14 @@ $(document).ready(function(){
         ]
     });
 
-    //addElement([
-    //    spinner,
-    //    '','','','','',''],dataTable_groups);
     $('#group_search').keyup(function(){
       dataTable_groups.fnFilter( $(this).val() );
     })
 
+    dataTable_groups.on('draw', function(){
+      recountCheckboxes(dataTable_groups);
+    })
+
     Sunstone.runAction("Group.list");
     setupCreateGroupDialog();
     setupGroupQuotasDialog();
diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js
index ac1405f3b2..638ba81011 100644
--- a/src/sunstone/public/js/plugins/hosts-tab.js
+++ b/src/sunstone/public/js/plugins/hosts-tab.js
@@ -982,10 +982,10 @@ $(document).ready(function(){
       dataTable_hosts.fnFilter( $(this).val() );
     })
 
-    //preload it
-    //addElement([
-    //    spinner,
-    //    '','','','','','','','','','','',''],dataTable_hosts);
+    dataTable_hosts.on('draw', function(){
+      recountCheckboxes(dataTable_hosts);
+    })
+
     Sunstone.runAction("Host.list");
 
     setupCreateHostDialog();
diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js
index 56a5b85b40..04dec4ba46 100644
--- a/src/sunstone/public/js/plugins/images-tab.js
+++ b/src/sunstone/public/js/plugins/images-tab.js
@@ -1311,9 +1311,10 @@ $(document).ready(function(){
       dataTable_images.fnFilter( $(this).val() );
     })
 
-    //addElement([
-    //    spinner,
-    //    '','','','','','','','','','','',''],dataTable_images);
+    dataTable_images.on('draw', function(){
+      recountCheckboxes(dataTable_images);
+    })
+
     Sunstone.runAction("Image.list");
 
     setupCreateImageDialog();
diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js
index 504d0ece19..6ead38aff1 100644
--- a/src/sunstone/public/js/plugins/marketplace-tab.js
+++ b/src/sunstone/public/js/plugins/marketplace-tab.js
@@ -324,6 +324,10 @@ $(document).ready(function(){
       dataTable_marketplace.fnFilter( $(this).val() );
     })
 
+    dataTable_marketplace.on('draw', function(){
+      recountCheckboxes(dataTable_marketplace);
+    })
+
     tableCheckboxesListener(dataTable_marketplace);
     onlyOneCheckboxListener(dataTable_marketplace);
 
diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index 4acc9d5e1e..bb0c8dcbc9 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -4479,9 +4479,10 @@ $(document).ready(function(){
       dataTable_templates.fnFilter( $(this).val() );
     })
 
-    //addElement([
-    //    spinner,
-    //    '','','','',''],dataTable_templates);
+    dataTable_templates.on('draw', function(){
+      recountCheckboxes(dataTable_templates);
+    })
+
     Sunstone.runAction("Template.list");
     setupInstantiateTemplateDialog();
     setupCreateTemplateDialog();
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index ab0cb90fbb..6b0b9f90cf 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -928,6 +928,10 @@ $(document).ready(function(){
       dataTable_users.fnFilter( $(this).val() );
     })
 
+    dataTable_users.on('draw', function(){
+      recountCheckboxes(dataTable_users);
+    })
+
     Sunstone.runAction("User.list");
 
     setupCreateUserDialog();
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 45adab2fee..b04bca5fb2 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -2949,6 +2949,10 @@ $(document).ready(function(){
       dataTable_vMachines.fnFilter( $(this).val() );
     })
 
+    dataTable_vMachines.on('draw', function(){
+      recountCheckboxes(dataTable_vMachines);
+    })
+
 
 
     //addElement([
diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js
index 6c7aadbb00..792b960132 100644
--- a/src/sunstone/public/js/plugins/vnets-tab.js
+++ b/src/sunstone/public/js/plugins/vnets-tab.js
@@ -1578,9 +1578,10 @@ $(document).ready(function(){
       dataTable_vNetworks.fnFilter( $(this).val() );
     })
 
-    //addElement([
-    //    spinner,
-    //    '','','','','','','',''],dataTable_vNetworks);
+    dataTable_vNetworks.on('draw', function(){
+      recountCheckboxes(dataTable_vNetworks);
+    })
+
     Sunstone.runAction("Network.list");
 
     setupCreateVNetDialog();