diff --git a/modules/ROOT/pages/access-control/manage-servers.adoc b/modules/ROOT/pages/access-control/manage-servers.adoc
index 799d7f9e7..2760fbf46 100644
--- a/modules/ROOT/pages/access-control/manage-servers.adoc
+++ b/modules/ROOT/pages/access-control/manage-servers.adoc
@@ -303,6 +303,10 @@ This may not be specified in combination with `deniedDatabases`.
 | list of database names
 | Only databases **not** matching the specified names may be hosted on the server.
 This may not be specified in combination with `allowedDatabases`.
+
+| tags
+| list of server tags
+| List of server tags used during database allocation and for load balancing and routing policies. 
 |===
 
 [NOTE]
@@ -311,6 +315,11 @@ Composite databases are ignored by both `allowedDatabases` and `deniedDatabases`
 The composite databases are available everywhere and hold no data on their own.
 ====
 
+[NOTE]
+====
+When a server is enabled, if `tags` are not provided in `OPTIONS`, the default server tags are taken from the setting `initial.server.tags`.
+====
+
 [[server-management-alter-server]]
 == Modifying servers
 
@@ -339,6 +348,10 @@ This may not be specified in combination with `deniedDatabases`.
 | list of database names
 | Only databases **not** matching the specified names may be hosted on the server.
 This may not be specified in combination with `allowedDatabases`.
+
+| tags
+| list of server tags
+| List of server tags used during database allocation and for load balancing and routing policies. 
 |===
 
 [NOTE]
@@ -347,6 +360,12 @@ Composite databases are ignored by both `allowedDatabases` and `deniedDatabases`
 The composite databases are available everywhere and hold no data on their own.
 ====
 
+[NOTE]
+====
+Input provided to `SET OPTIONS {...}` replaces **all** existing options, rather than being combined with them.
+For instance, if `SET OPTIONS {modeConstraint:'SECONDARY'}` is run followed by `SET OPTIONS {allowedDatabases:['foo']}`, the second `ALTER` removes the mode constraint.
+====
+
 [[server-management-rename-server]]
 == Renaming servers