diff --git a/userguide/aviate/aviate-changelog.adoc b/userguide/aviate/aviate-changelog.adoc
index 81e653090..3f2edf9a2 100644
--- a/userguide/aviate/aviate-changelog.adoc
+++ b/userguide/aviate/aviate-changelog.adoc
@@ -1,5 +1,9 @@
 = Aviate Changelog
 
+== February, 24th 2026
+
+* *Plugin Configuration Screen* - There have been several bug fixes in the plugin configuration screen,delivering a smoother and more seamless experience for users. These fixes eliminate previous glitches. As a result, configuring plugins is now faster, more reliable, and less error-prone.
+
 == February, 10th 2026
 
 * *Create Tenant Option* - The Add Tenant form now includes a “Create if missing” option, allowing users to automatically create a tenant in the selected deployment if it does not already exist. This streamlines setup and removes the need for manual pre-creation.
diff --git a/userguide/platform/includes/killbill-configuration-properties-table.adoc b/userguide/platform/includes/killbill-configuration-properties-table.adoc
index f477e34da..bd6365bd9 100644
--- a/userguide/platform/includes/killbill-configuration-properties-table.adoc
+++ b/userguide/platform/includes/killbill-configuration-properties-table.adoc
@@ -392,13 +392,13 @@ KB_org_killbill_persistent_bus_${instanceName}_inflight_min   |Min number of bus
 KB_org_killbill_persistent_bus_${instanceName}_inflight_max   |Max number of bus events to fetch from the database at once (only valid in 'STICKY_EVENTS')   |100   |Config File/Environment Variable
 |org.killbill.persistent.bus.${instanceName}.claimed/
 
-KB_org_killbill_persistent_bus_${instanceName}_claimed   |Number of bus events to fetch from the database at once (only valid in 'polling mode')   |10   |Config File/Environment Variable
+KB_org_killbill_persistent_bus_${instanceName}_claimed   |Number of bus events to fetch from the database at once (only valid in 'POLLING' mode)   |10   |Config File/Environment Variable
 |org.killbill.persistent.bus.${instanceName}.queue.mode/
 
-KB_org_killbill_persistent_bus_${instanceName}_queue_mode   |How entries are put in the queue   |STICKY_EVENTS   |Config File/Environment Variable
+KB_org_killbill_persistent_bus_${instanceName}_queue_mode   |How entries are put in the queue   |POLLING   |Config File/Environment Variable
 |org.killbill.persistent.bus.${instanceName}.claim.time/
 
-KB_org_killbill_persistent_bus_${instanceName}_claim_time   |Claim time   |5m   |Config File/Environment Variable
+KB_org_killbill_persistent_bus_${instanceName}_claim_time   |Specifies the duration for which an entry is marked as claimed before it becomes eligible to be reclaimed for processing.   |5m   |Config File/Environment Variable
 |org.killbill.persistent.bus.${instanceName}.sleep/
 
 KB_org_killbill_persistent_bus_${instanceName}_sleep   |Time in milliseconds to sleep between runs (only valid in STICKY_POLLING, POLLING)   |3000   |Config File/Environment Variable
@@ -462,10 +462,10 @@ KB_org_killbill_persistent_bus_${instanceName}_inflight_max   |Max number of bus
 KB_org_killbill_notificationq_${instanceName}_claimed   |Number of notifications to fetch at once   |10   |Config File/Environment Variable
 |org.killbill.notificationq.${instanceName}.queue.mode/
 
-KB_org_killbill_notificationq_${instanceName}_queue_mode   |How entries are put in the queue   |STICKY_POLLING   |Config File/Environment Variable
+KB_org_killbill_notificationq_${instanceName}_queue_mode   |How entries are put in the queue   |POLLING   |Config File/Environment Variable
 |org.killbill.notificationq.${instanceName}.claim.time/
 
-KB_org_killbill_notificationq_${instanceName}_claim_time   |Claim time   |5m   |Config File/Environment Variable
+KB_org_killbill_notificationq_${instanceName}_claim_time   |Specifies the duration for which an entry is marked as claimed before it becomes eligible to be reclaimed for processing.   |5m   |Config File/Environment Variable
 |org.killbill.notificationq.${instanceName}.sleep/
 
 KB_org_killbill_notificationq_${instanceName}_sleep   |Time in milliseconds to sleep between runs   |3000   |Config File/Environment Variable
diff --git a/userguide/platform/userguide_deployment.adoc b/userguide/platform/userguide_deployment.adoc
index 3653dbbfb..b5cc8e2f9 100644
--- a/userguide/platform/userguide_deployment.adoc
+++ b/userguide/platform/userguide_deployment.adoc
@@ -107,9 +107,9 @@ Events are moved from the `bus_events` to the `bus_events_history` as they are p
 
 The bus event can be run in multiple modes (`instanceName` below is either `main` or `external`):
 
-* *POLLING*: the bus will poll the database for new available entries and dispatch them across the nodes.
+* *POLLING* (default mode): the bus will poll the database for new available entries and dispatch them across the nodes.
 * *STICKY_POLLING*: the bus will poll the database for new available entries and dispatch them to the same node that created the entry.
-* *STICKY_EVENTS* (default mode): in that mode, the bus now behaves as a blocking queue where entries are dispatched as soon as they have been committed to disk. This is a much more efficient mechanism both in terms of latency (because entries are picked up right away) and throughput (because there is no time for entries to accumulate).
+* *STICKY_EVENTS* : in that mode, the bus now behaves as a blocking queue where entries are dispatched as soon as they have been committed to disk. This is a much more efficient mechanism both in terms of latency (because entries are picked up right away) and throughput (because there is no time for entries to accumulate).
 
 In a cloud environment, where nodes are more prone to appear and disappear, the following choices are available: