diff --git a/data/web/js/site/admin.js b/data/web/js/site/admin.js
index e9f12cbf..f21349cd 100644
--- a/data/web/js/site/admin.js
+++ b/data/web/js/site/admin.js
@@ -533,13 +533,13 @@ jQuery(function($){
     });
   }
   // Draw Table if tab is active
-  onVisible("[id^=collapse-tab-config-admins]", () => draw_admins());
-  onVisible("[id^=collapse-tab-config-dadmins]", () => draw_domain_admins());
-  onVisible("[id^=collapse-tab-config-oauth2]", () => draw_oauth2_clients());
-  onVisible("[id^=collapse-tab-config-fwdhosts]", () => draw_fwd_hosts());
-  onVisible("[id^=collapse-tab-routing]", () => draw_relayhosts());
-  onVisible("[id^=collapse-tab-maps]", () => draw_transport_maps());
-  onVisible("[id^=collapse-tab-mailq]", () => draw_queue());
+  onVisible("[id^=adminstable]", () => draw_admins());
+  onVisible("[id^=domainadminstable]", () => draw_domain_admins());
+  onVisible("[id^=oauth2clientstable]", () => draw_oauth2_clients());
+  onVisible("[id^=forwardinghoststable]", () => draw_fwd_hosts());
+  onVisible("[id^=relayhoststable]", () => draw_relayhosts());
+  onVisible("[id^=transportstable]", () => draw_transport_maps());
+  onVisible("[id^=queuetable]", () => draw_queue());
 
 
   $('body').on('click', 'span.footable-toggle', function () {
diff --git a/data/web/js/site/debug.js b/data/web/js/site/debug.js
index fa01e5aa..a8927198 100644
--- a/data/web/js/site/debug.js
+++ b/data/web/js/site/debug.js
@@ -54,22 +54,6 @@ jQuery(function($){
     var table_name = $(this).data('table');
     $('#' + table_name).DataTable().ajax.reload();
   });
-  function table_log_ready(ft, name) {
-    heading = ft.$el.parents('.card').find('.card-header')
-    var ft_paging = ft.use(FooTable.Paging)
-    $('.refresh_table').prop("disabled", false);
-    $(heading).children('.table-lines').text(function(){
-      return ft_paging.totalRows;
-    })
-    if (current_page[name]) {
-      ft_paging.goto(parseInt(current_page[name]))
-    }
-  }
-  function table_log_paging(ft, name) {
-    var ft_paging = ft.use(FooTable.Paging)
-    current_page[name] = ft_paging.current;
-    localStorage.setItem('current_page', JSON.stringify(current_page));
-  }
   function draw_autodiscover_logs() {
     $('#autodiscover_log').DataTable({
       processing: true,
@@ -861,19 +845,17 @@ jQuery(function($){
     });
   }
   // Draw Table if tab is active
-  onVisible("[id^=tab-postfix-logs]", () => draw_postfix_logs());
-  onVisible("[id^=tab-dovecot-logs]", () => draw_dovecot_logs());
-  onVisible("[id^=tab-sogo-logs]", () => draw_sogo_logs());
-  onVisible("[id^=tab-watchdog-logs]", () => draw_watchdog_logs());
-  onVisible("[id^=tab-autodiscover-logs]", () => draw_autodiscover_logs());
-  onVisible("[id^=tab-acme-logs]", () => draw_acme_logs());
-  onVisible("[id^=tab-api-logs]", () => draw_api_logs());
-  onVisible("[id^=tab-api-rl]", () => draw_rl_logs());
-  onVisible("[id^=tab-ui]", () => draw_ui_logs());
-  onVisible("[id^=tab-sasl]", () => draw_sasl_logs());
-  onVisible("[id^=tab-netfilter-logs]", () => draw_netfilter_logs());
-  onVisible("[id^=tab-rspamd-history]", () => {
-    rspamd_pie_graph();
-    draw_rspamd_history()
-  });
+  onVisible("[id^=postfix_log]", () => draw_postfix_logs());
+  onVisible("[id^=dovecot_log]", () => draw_dovecot_logs());
+  onVisible("[id^=sogo_log]", () => draw_sogo_logs());
+  onVisible("[id^=watchdog_log]", () => draw_watchdog_logs());
+  onVisible("[id^=autodiscover_log]", () => draw_autodiscover_logs());
+  onVisible("[id^=acme_log]", () => draw_acme_logs());
+  onVisible("[id^=api_log]", () => draw_api_logs());
+  onVisible("[id^=rl_log]", () => draw_rl_logs());
+  onVisible("[id^=ui_logs]", () => draw_ui_logs());
+  onVisible("[id^=sasl_logs]", () => draw_sasl_logs());
+  onVisible("[id^=netfilter_log]", () => draw_netfilter_logs());
+  onVisible("[id^=rspamd_history]", () => draw_rspamd_history());
+  onVisible("[id^=rspamd_donut]", () => rspamd_pie_graph());
 });
diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js
index 0ea3b3d3..acd86d9a 100644
--- a/data/web/js/site/mailbox.js
+++ b/data/web/js/site/mailbox.js
@@ -1195,14 +1195,14 @@ jQuery(function($){
   }
 
   // Load only if the tab is visible
-  onVisible("[id^=collapse-tab-domains]", () => draw_domain_table());
-  onVisible("[id^=collapse-tab-mailboxes]", () => draw_mailbox_table());
-  onVisible("[id^=collapse-tab-resources]", () => draw_resource_table());
-  onVisible("[id^=collapse-tab-mbox-aliases]", () => draw_alias_table());
-  onVisible("[id^=collapse-tab-domain-aliases]", () => draw_aliasdomain_table());
-  onVisible("[id^=collapse-tab-syncjobs]", () => draw_sync_job_table());
-  onVisible("[id^=collapse-tab-filters]", () => draw_filter_table());
-  onVisible("[id^=collapse-tab-bcc]", () => draw_bcc_table());
-  onVisible("[id^=collapse-tab-bcc-filters]", () => draw_recipient_map_table());
-  onVisible("[id^=collapse-tab-tls-policy]", () => draw_tls_policy_table());
+  onVisible("[id^=domain_table]", () => draw_domain_table());
+  onVisible("[id^=mailbox_table]", () => draw_mailbox_table());
+  onVisible("[id^=resource_table]", () => draw_resource_table());
+  onVisible("[id^=alias_table]", () => draw_alias_table());
+  onVisible("[id^=aliasdomain_table]", () => draw_aliasdomain_table());
+  onVisible("[id^=sync_job_table]", () => draw_sync_job_table());
+  onVisible("[id^=filter_table]", () => draw_filter_table());
+  onVisible("[id^=bcc_table]", () => draw_bcc_table());
+  onVisible("[id^=recipient_map_table]", () => draw_recipient_map_table());
+  onVisible("[id^=tls_policy_table]", () => draw_tls_policy_table());
 });
diff --git a/data/web/js/site/user.js b/data/web/js/site/user.js
index 52440d91..a58ddd1c 100644
--- a/data/web/js/site/user.js
+++ b/data/web/js/site/user.js
@@ -538,12 +538,10 @@ jQuery(function($){
   }
 
   // Load only if the tab is visible
-  onVisible("[id^=collapse-tab-SpamAliases]", () => draw_tla_table());
-  onVisible("[id^=collapse-tab-Spamfilter]", () => {
-    draw_bl_policy_mailbox_table();
-    draw_wl_policy_mailbox_table()
-  });
-  onVisible("[id^=collapse-tab-Syncjobs]", () => draw_sync_job_table());
-  onVisible("[id^=collapse-tab-AppPasswds]", () => draw_app_passwd_table());
+  onVisible("[id^=tla_table]", () => draw_tla_table());
+  onVisible("[id^=bl_policy_mailbox_table]", () => draw_bl_policy_mailbox_table());
+  onVisible("[id^=wl_policy_mailbox_table]", () => draw_wl_policy_mailbox_table());
+  onVisible("[id^=sync_job_table]", () => draw_sync_job_table());
+  onVisible("[id^=app_passwd_table]", () => draw_app_passwd_table());
   last_logins('get');
 });