diff --git a/skel/share/defaults/frontend.properties b/skel/share/defaults/frontend.properties
index 0d16b3282cd..b5ea644ba68 100644
--- a/skel/share/defaults/frontend.properties
+++ b/skel/share/defaults/frontend.properties
@@ -111,6 +111,8 @@ frontend.service.transfers.timeout=1
 frontend.service.transfers.maxCacheSize=1000
 
 # Timeout for cell info collection
+#
+# Amongst others, this affects the `/cells`-resource of the REST interface.
 # These properties can also be set interactively through the admin door
 frontend.service.cell-info.timeout=1
 (one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)frontend.service.cell-info.timeout.unit=MINUTES
@@ -119,6 +121,8 @@ frontend.service.cell-info.timeout=1
 frontend.service.cell-info.update-threads=10
 
 # Timeout for domain info collection
+#
+# Amongst others, this affects the `/domains`-resource of the REST interface.
 # These properties can also be set interactively through the admin door
 frontend.service.domain-info.timeout=1
 (one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)frontend.service.domain-info.timeout.unit=MINUTES
@@ -135,12 +139,16 @@ frontend.service.alarms.timeout=1
 (one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)frontend.service.alarms.timeout.unit=MINUTES
 
 # Timeout for pool info collection
+#
+# Amongst others, this affects the `/pools`-resource of the REST interface.
 # These properties can also be set interactively through the admin door
 frontend.service.pool-info.timeout=1
 (one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)frontend.service.pool-info.timeout.unit=MINUTES
 
 # Timeout for pool history info collection
-# These properties can also be set interactively through the admin door
+#
+# Amongst others, this affects the `/poolgroups/{group}/histograms`- and
+# `/pools/{pool}/histograms`-resources of the REST interface.
 frontend.service.pool-history.timeout=1
 (one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)frontend.service.pool-history.timeout.unit=MINUTES
 
@@ -459,6 +467,8 @@ frontend.service.billing.collection.timeout = 1
 # Whether to submit namespace qos requests to the QoSEngine or to use
 # the embedded legacy mechanism.  Defaults to the new QoSEngine.
 (one-of?true|false)frontend.service.namespace.use-qos-service= true
+(one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)\
+frontend.service.billing.collection.timeout.unit = MINUTES
 
 # Geographic placement
 #
@@ -467,8 +477,6 @@ frontend.service.billing.collection.timeout = 1
 #
 frontend.geographic-placement =
 
-(one-of?MILLISECONDS|SECONDS|MINUTES|HOURS|DAYS)\
-frontend.service.billing.collection.timeout.unit = MINUTES
 
 #  ---- Directory with default static content
 #