diff --git a/front/changeLogCore.php b/front/changeLogCore.php
index 0b01c473..4b47f52a 100644
--- a/front/changeLogCore.php
+++ b/front/changeLogCore.php
@@ -15,10 +15,8 @@
   <div class="row">
     <div class="col-xs-12">
       <div class="box">
-
-        <!-- ===================== -->
-        <!-- Filter Bar -->
-        <!-- ===================== -->
+      
+        <!-- Filter Bar -->      
         <div class="box-header" style="display:flex; gap:10px; flex-wrap:wrap; align-items:center;">
           <select id="filterChangedBy" class="form-control" style="width:200px;">
             <option value=""><?= lang('device_history_col_source'); ?> - All</option>
@@ -31,9 +29,7 @@
           <?= lang('device_history_col_changes'); ?>
         </div>
 
-        <!-- ===================== -->
         <!-- Data Table -->
-        <!-- ===================== -->
         <div class="box-body">
           <table id="changeHistoryTable" class="table table-bordered table-striped">
             <thead>
@@ -321,7 +317,7 @@
       queryString += `?devGUID=${getDevDataByMac(urlMac, "devGUID")}`;
     }
 
-    const url = `${apiBaseUrl}/${apiEndpoint}${encodeURIComponent(queryString)}`;
+    const url = `${apiBaseUrl}/${apiEndpoint}${queryString}`;
 
     $.ajax({
       url,
diff --git a/front/css/app.css b/front/css/app.css
index 751be365..d9fd33fb 100755
--- a/front/css/app.css
+++ b/front/css/app.css
@@ -2219,6 +2219,12 @@ textarea[readonly],
     padding-top: 20px;
 }
 
+.pluginsCore .helpIcon
+{
+    margin-left: -20px;
+    font-size: x-small;
+}
+
 /*Hidden special button*/
 
 @media (max-width: 365px) {
@@ -2658,6 +2664,17 @@ table.dataTable tbody > tr.selected
     font-size: x-small;
 }
 
+#panHistory
+{
+    min-height:850px
+}
+
+#panHistory .change-log-skeleton-class 
+{
+    margin-left: 0px;
+    width: calc(100% - 40px);
+}
+
 /* -----------------------------------------------------------------------------
    Loading Skeletons
 ----------------------------------------------------------------------------- */
@@ -2693,7 +2710,7 @@ table.dataTable tbody > tr.selected
 /* Positioning anchors */
 #settingsPage, #devicesPage, #deviceDetailsPage,
 #eventsPage, #presencePage, #reportPage, #notifications, #wf-content-wrapper, #pluginsPage,
-#panDetails, #panSessions, #panPresence, #panEvents, #appEvents {
+#panDetails, #panSessions, #panPresence, #panEvents, #appEvents #panHistory{
     position: relative;
 }
 
diff --git a/front/deviceDetailsEvents.php b/front/deviceDetailsEvents.php
index 27247c9d..34980b80 100755
--- a/front/deviceDetailsEvents.php
+++ b/front/deviceDetailsEvents.php
@@ -196,7 +196,12 @@ function initDeviceEventsPage()
 
 // -----------------------------------------------------------------------------
 // Recurring function to monitor the URL and reinitialize if needed
-initLazyTab('#panEvents', initDeviceEventsPage);
+function deviceEventsPageUpdater() {
+  initDeviceEventsPage();
+
+  // Run updater again after delay
+  setTimeout(deviceEventsPageUpdater, 200);
+}
 
 deviceEventsPageUpdater();
 
diff --git a/front/php/templates/skel_change_log.php b/front/php/templates/skel_change_log.php
index 73bc816f..c51c0b64 100644
--- a/front/php/templates/skel_change_log.php
+++ b/front/php/templates/skel_change_log.php
@@ -1,7 +1,7 @@
 <!-- Change log Table Skeleton === -->
-<div id="change-log-skeleton" class="  spinnerTarget">
+<div id="change-log-skeleton" class=" change-log-skeleton-class">
     <section class="box">
-        <div class="skel-table-box  spinnerTarget">
+        <div class="skel-table-box ">
         <div class="skel-table-header-row">
             <?php for ($j = 0; $j < 5; $j++): ?>
             <span class="skel-th skel-shimmer"></span>
diff --git a/front/php/templates/skel_device_details_tab_history.php b/front/php/templates/skel_device_details_tab_history.php
deleted file mode 100644
index 67b53112..00000000
--- a/front/php/templates/skel_device_details_tab_history.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- Change Log Tab Skeleton =============================================== -->
-<div id="skel-tab-history" class="skel-tab-pane spinnerTarget">
-  <!-- Filter row -->
-  <div style="display:flex; align-items:center; gap:10px; margin-bottom:12px; padding:0 2px;">
-    <span class="skel-shimmer" style="width:120px; height:28px; border-radius:4px; flex-shrink:0;"></span>
-    <span class="skel-shimmer" style="width:120px; height:28px; border-radius:4px; flex-shrink:0;"></span>
-  </div>
-  <!-- Table -->
-  <div class="skel-table-box">
-    <div class="skel-table-header-row">
-      <span class="skel-th skel-shimmer" style="flex:1.5"></span>
-      <span class="skel-th skel-shimmer" style="flex:1.5"></span>
-      <span class="skel-th skel-shimmer" style="flex:4"></span>
-    </div>
-    <?php for ($i = 0; $i < 6; $i++): ?>
-    <div class="skel-tr">
-      <span class="skel-td skel-shimmer" style="flex:1.5; max-width:16%"></span>
-      <span class="skel-td skel-shimmer" style="flex:1.5; max-width:14%"></span>
-      <div style="flex:4; display:flex; flex-direction:column; gap:4px; padding:4px 0;">
-        <span class="skel-td skel-shimmer" style="width:<?= 40 + ($i * 7) % 30 ?>%"></span>
-        <span class="skel-td skel-shimmer" style="width:<?= 30 + ($i * 11) % 25 ?>%"></span>
-      </div>
-    </div>
-    <?php endfor; ?>
-  </div>
-</div>
diff --git a/front/pluginsCore.php b/front/pluginsCore.php
index 66f4e0ed..c71b8d3b 100755
--- a/front/pluginsCore.php
+++ b/front/pluginsCore.php
@@ -9,7 +9,10 @@
 
 <!-- Main content ---------------------------------------------------------- -->
 <?php require 'php/templates/skel_plugins.php'; ?>
-<section class="content">
+<section class="content pluginsCore">
+  <span class="helpIcon"> 
+    <a target="_blank" href="https://docs.netalertx.com/PLUGINS"><i class="fa fa-circle-question"></i></a>
+  </span>
   <div class="plugin-filters hidden" >
     <div class="input-group col-sm-12">
       <label class="col-sm-3"><?= lang('Plugins_Filters_Mac');?></label>
diff --git a/front/workflows.php b/front/workflows.php
index 633590a0..5395d9a8 100755
--- a/front/workflows.php
+++ b/front/workflows.php
@@ -6,9 +6,11 @@
 
 
 <!-- Page ------------------------------------------------------------------ -->
-<div class="content-wrapper" id="wf-content-wrapper">
+<div id="wf-content-wrapper" class="content-wrapper spinnerTarget" >
 <?php require 'php/templates/skel_workflows.php'; ?>
-<span class="helpIcon"> <a target="_blank" href="https://docs.netalertx.com/WORKFLOWS"><i class="fa fa-circle-question"></i></a></span>
+<span class="helpIcon"> 
+  <a target="_blank" href="https://docs.netalertx.com/WORKFLOWS"><i class="fa fa-circle-question"></i></a>
+</span>
 <?php
    require 'workflowsCore.php';
 ?>
diff --git a/server/api_server/graphql_endpoint.py b/server/api_server/graphql_endpoint.py
index a7e86aac..b401874f 100755
--- a/server/api_server/graphql_endpoint.py
+++ b/server/api_server/graphql_endpoint.py
@@ -131,6 +131,7 @@ class Query(ObjectType):
                     devGUID=devGUID,
                     changedColumn=changedColumn,
                     changedBy=changedBy,
+                    search=paging["search"]
                 )
             else:
                 groups = h.get_all_grouped_history(
@@ -145,6 +146,7 @@ class Query(ObjectType):
                 total = h.get_total_group_count(
                     changedColumn=changedColumn,
                     changedBy=changedBy,
+                    search=paging["search"]
                 )
 
             return DeviceHistoryResult(
diff --git a/server/models/device_history_instance.py b/server/models/device_history_instance.py
index 5adbce3b..9547ffff 100644
--- a/server/models/device_history_instance.py
+++ b/server/models/device_history_instance.py
@@ -115,12 +115,12 @@ class DevicesHistoryInstance:
             "changedColumn": [r["changedColumn"] for r in col_rows],
         }
 
-    def get_total_group_count(self, devGUID=None, changedColumn=None, changedBy=None):
+    def get_total_group_count(self, devGUID=None, changedColumn=None, changedBy=None, search=None):
         """
         Return the total number of distinct change-event groups matching the
         given filters. Used by the frontend to calculate total pages.
         """
-        clauses, params = self._build_clauses(devGUID, changedColumn, changedBy)
+        clauses, params = self._build_clauses(devGUID, changedColumn, changedBy, search)
         where = f"WHERE {' AND '.join(clauses)}" if clauses else ""
 
         rows = self._fetchall(