diff --git a/modules/ROOT/pages/clauses/create.adoc b/modules/ROOT/pages/clauses/create.adoc
index 57843ddae..f07d0a235 100644
--- a/modules/ROOT/pages/clauses/create.adoc
+++ b/modules/ROOT/pages/clauses/create.adoc
@@ -234,6 +234,7 @@ This is because a relationship can only have exactly one type.
 ----
 
 .Create nodes and relationships using dynamic node labels and relationship types
+// tag::clauses_create_dynamic_create[]
 [source, cypher]
 ----
 CREATE (greta:$($nodeLabels) {name: 'Greta Gerwig'})
@@ -242,6 +243,7 @@ UNWIND $movies AS movieTitle
 CREATE (greta)-[rel:$($relType)]->(m:Movie {title: movieTitle})
 RETURN greta.name AS name, labels(greta) AS labels, type(rel) AS relType, collect(m.title) AS movies
 ----
+// end::clauses_create_dynamic_create[]
 
 .Result
 [role="queryresult",options="footer",cols="4*<m"]
diff --git a/modules/ROOT/pages/clauses/finish.adoc b/modules/ROOT/pages/clauses/finish.adoc
index 21413fc51..814575c39 100644
--- a/modules/ROOT/pages/clauses/finish.adoc
+++ b/modules/ROOT/pages/clauses/finish.adoc
@@ -2,17 +2,19 @@
 [[query-finish]]
 = FINISH
 
-A query ending in `FINISH` — instead of `RETURN` — has no result but executes all its side effects.
+A query ending in `FINISH` -- instead of `RETURN` -- has no result but executes all its side effects.
 `FINISH` was introduced as part of Cypher's xref:appendix/gql-conformance/index.adoc[].
 
 The following read query successfully executes but has no results:
 
 .Query
+// tag::clauses_finish_match[]
 [source, cypher]
 ----
 MATCH (p:Person)
 FINISH
 ----
+// end::clauses_finish_match[]
 
 The following query has no result but creates one node with the label `Person`:
 
diff --git a/modules/ROOT/pages/clauses/foreach.adoc b/modules/ROOT/pages/clauses/foreach.adoc
index b594ecace..2132954e6 100644
--- a/modules/ROOT/pages/clauses/foreach.adoc
+++ b/modules/ROOT/pages/clauses/foreach.adoc
@@ -33,15 +33,17 @@ CREATE
 [[foreach-mark-all-nodes-along-a-path]]
 == Mark all nodes along a path
 
-This query will set the property `marked` to `true` on all nodes along a path.
+This query sets the property `marked` to `true` on all nodes along a path.
 
 .Query
+// tag::clauses_foreach_node[]
 [source, cypher, indent=0]
 ----
 MATCH p=(start)-[*]->(finish)
 WHERE start.name = 'A' AND finish.name = 'D'
 FOREACH (n IN nodes(p) | SET n.marked = true)
 ----
+// end::clauses_foreach_node[]
 
 .Result
 [role="queryresult",options="footer",cols="1*<m"]
@@ -51,3 +53,47 @@ d|Rows: 0 +
 Properties set: 4
 |===
 
+
+[[foreach-mark-all-relationships-along-a-path]]
+== Mark all relationships along a path
+
+This query sets the property `marked` to `true` on all relationships along a path.
+
+// tag::clauses_foreach_relationship[]
+[source, cypher, indent=0]
+----
+MATCH p=(start)-[*]->(finish)
+WHERE start.name = 'A' AND finish.name = 'D'
+FOREACH ( r IN relationships(p) | SET r.marked = true )
+----
+// end::clauses_foreach_relationship[]
+
+.Result
+[role="queryresult",options="footer",cols="1*<m"]
+|===
+|(empty result)
+d|Rows: 0 +
+Properties set: 3
+|===
+
+[[foreach-create-new-nodes-form-a-list]]
+== Create new nodes from a list of name labels
+
+This query creates a new node for each label in a list.
+
+.Query
+// tag::clauses_foreach_create[]
+[source, cypher, indent=0]
+----
+WITH ['E', 'F', 'G'] AS names
+FOREACH ( value IN names | CREATE (:Person {name: value}) )
+----
+// end::clauses_foreach_create[]
+
+.Result
+[role="queryresult",options="footer",cols="1*<m"]
+|===
+1+|(empty result)
+1+d|Rows: 0 +
+Nodes created: 3
+|===
\ No newline at end of file
diff --git a/modules/ROOT/pages/clauses/limit.adoc b/modules/ROOT/pages/clauses/limit.adoc
index 443012915..a75db6b56 100644
--- a/modules/ROOT/pages/clauses/limit.adoc
+++ b/modules/ROOT/pages/clauses/limit.adoc
@@ -166,12 +166,14 @@ Properties set: 1
 `LIMIT` can be used as a standalone clause, or in conjunction with xref:clauses/order-by.adoc[`ORDER BY`] or xref:clauses/skip.adoc[`SKIP`]/xref:clauses/skip.adoc#offset-synonym[`OFFSET`].
 
 .Standalone use of `LIMIT`
+// tag::clauses_limit_standalone[]
 [source, cypher]
 ----
 MATCH (n)
 LIMIT 2
 RETURN collect(n.name) AS names
 ----
+// end::clauses_limit_standalone[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -185,6 +187,7 @@ The following query orders all nodes by `name` descending, skips the two first r
 It then xref:functions/aggregating.adoc#functions-collect[collects] the results in a list.
 
 .`LIMIT` used in conjunction with `ORDER BY` and `SKIP`
+// tag::clauses_limit[]
 [source, cypher]
 ----
 MATCH (n)
@@ -193,6 +196,7 @@ SKIP 2
 LIMIT 2
 RETURN collect(n.name) AS names
 ----
+// end::clauses_limit[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
diff --git a/modules/ROOT/pages/clauses/load-csv.adoc b/modules/ROOT/pages/clauses/load-csv.adoc
index ea72acd8c..dd75bd942 100644
--- a/modules/ROOT/pages/clauses/load-csv.adoc
+++ b/modules/ROOT/pages/clauses/load-csv.adoc
@@ -46,12 +46,14 @@ By default, paths are resolved relative to the Neo4j import directory.
 ----
 
 .Query
+// tag::clauses_load_csv_local_files[]
 [source, cypher]
 ----
 LOAD CSV FROM 'file:///artists.csv' AS row
 MERGE (a:Artist {name: row[1], year: toInteger(row[2])})
 RETURN a.name, a.year
 ----
+// end::clauses_load_csv_local_files[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -112,12 +114,14 @@ However, this means that insecure URLs on virtual hosts will not function unless
 ----
 
 .Query
+// tag::clauses_load_csv_remote_locations[]
 [source, cypher]
 ----
 LOAD CSV FROM 'https://data.neo4j.com/bands/artists.csv' AS row
 MERGE (a:Artist {name: row[1], year: toInteger(row[2])})
 RETURN a.name, a.year
 ----
+// end::clauses_load_csv_remote_locations[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -308,7 +312,7 @@ It also mitigates the risk of Cypher injection.
 (For more information about Cypher injection, see link:https://neo4j.com/developer/kb/protecting-against-cypher-injection/[Neo4j Knowledge Base -> Protecting against Cypher injection]).
 
 .bands-with-headers.csv
-[source, csv, filename="artists-with-headers.csv"]
+[source, csv, filename="bands-with-headers.csv"]
 ----
 Id,Label,Name
 1,Band,The Beatles
@@ -318,12 +322,14 @@ Id,Label,Name
 ----
 
 .Query
-[source, cypher, role=test-skip]
+// tag::clauses_load_csv_dynamic_columns[]
+[source, cypher]
 ----
 LOAD CSV WITH HEADERS FROM 'file:///bands-with-headers.csv' AS line
 MERGE (n:$(line.Label) {name: line.Name})
 RETURN n AS bandNodes
 ----
+// end::clauses_load_csv_dynamic_columns[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -705,6 +711,7 @@ person_tmdbId,bio,born,bornIn,died,person_imdbId,name,person_poster,person_url
 The below query uses a xref:subqueries/call-subquery.adoc#variable-scope-clause[variable scope clause] to import variables into the `CALL` subquery.
 
 .Query
+// tag::clauses_load_csv_transactions[]
 [source, cypher]
 ----
 LOAD CSV WITH HEADERS FROM 'https://data.neo4j.com/importing-cypher/persons.csv' AS row
@@ -713,6 +720,7 @@ CALL (row) {
   SET p.name = row.name, p.born = row.born
 } IN TRANSACTIONS OF 200 ROWS
 ----
+// end::clauses_load_csv_transactions[]
 
 .Result
 [source, role="queryresult"]
@@ -747,11 +755,13 @@ A common use case for this function is to generate sequential unique IDs for CSV
 ----
 
 .Query
+// tag::clauses_load_csv_linenumber[]
 [source, cypher]
 ----
 LOAD CSV FROM 'file:///artists.csv' AS row
 RETURN linenumber() AS number, row
 ----
+// end::clauses_load_csv_linenumber[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -782,11 +792,13 @@ The xref:functions/load-csv.adoc#functions-file[`file()`] function provides the
 ----
 
 .Query
+// tag::clauses_load_csv_file[]
 [source, cypher, role=test-result-skip]
 ----
 LOAD CSV FROM 'file:///artists.csv' AS row
 RETURN DISTINCT file() AS path
 ----
+// end::clauses_load_csv_file[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -833,6 +845,7 @@ Id,Name,Year
 ----
 
 .Query
+// tag::clauses_load_csv_headers[]
 [source, cypher]
 ----
 LOAD CSV WITH HEADERS FROM 'file:///artists-with-headers.csv' AS row
@@ -841,6 +854,7 @@ RETURN
   a.name AS name,
   a.year AS year
 ----
+// end::clauses_load_csv_headers[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -876,11 +890,13 @@ If you try to import a file that doesn't use `,` as field delimiter and you also
 ----
 
 .Query
+// tag::clauses_load_csv_field_terminator[]
 [source, cypher]
 ----
 LOAD CSV FROM 'file:///artists-fieldterminator.csv' AS row FIELDTERMINATOR ';'
 MERGE (:Artist {name: row[1], year: toInteger(row[2])})
 ----
+// end::clauses_load_csv_field_terminator[]
 
 .Result
 [source, role="queryresult"]
diff --git a/modules/ROOT/pages/clauses/match.adoc b/modules/ROOT/pages/clauses/match.adoc
index 207483bde..7596a47a0 100644
--- a/modules/ROOT/pages/clauses/match.adoc
+++ b/modules/ROOT/pages/clauses/match.adoc
@@ -45,11 +45,13 @@ For more information about finding node patterns, see xref:patterns/fixed-length
 By specifying a pattern with a single node and no labels, all nodes in the graph will be returned.
 
 .Find all nodes in a graph
+// tag::clauses_match_all_nodes[]
 [source, cypher]
 ----
 MATCH (n)
 RETURN n
 ----
+// end::clauses_match_all_nodes[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -70,11 +72,13 @@ RETURN n
 === Find nodes with a specific label
 
 .Find all nodes with the `Movie` label
+// tag::clauses_match_label[]
 [source, cypher]
 ----
 MATCH (movie:Movie)
 RETURN movie.title
 ----
+// end::clauses_match_label[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -90,11 +94,14 @@ RETURN movie.title
 === MATCH using node label expressions
 
 .Node pattern using the `OR` (`|`) label expression
+// tag::clauses_match_label_expression_or[]
 [source, cypher]
 ----
 MATCH (n:Movie|Person)
 RETURN n.name AS name, n.title AS title
 ----
+// end::clauses_match_label_expression_or[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -111,11 +118,14 @@ RETURN n.name AS name, n.title AS title
 |===
 
 .Node pattern using negation (`!`) label expression
+// tag::clauses_match_label_expression_negation[]
 [source, cypher]
 ----
 MATCH (n:!Movie)
 RETURN labels(n) AS label, count(n) AS labelCount
 ----
+// end::clauses_match_label_expression_negation[]
+
 
 [NOTE]
 The above query uses the xref:functions/list.adoc#functions-labels[`labels()`] and xref:functions/aggregating.adoc#functions-count[`count()`] functions.
@@ -189,11 +199,13 @@ RETURN movie.title AS movieTitle
 It is possible to introduce a variable to a pattern, either for filtering on relationship properties or to return a relationship.
 
 .Find the types of an aliased relationship
+// tag::clauses_match_relationship_types[]
 [source, cypher]
 ----
 MATCH (:Person {name: 'Oliver Stone'})-[r]->()
 RETURN type(r) AS relType
 ----
+// end::clauses_match_relationship_types[]
 
 [NOTE]
 The above query uses the xref:functions/scalar.adoc#functions-type[`type()` function].
@@ -238,11 +250,13 @@ RETURN a, b
 It is possible to specify the type of a relationship in a relationship pattern by using a colon (`:`) before the relationship type.
 
 .Relationship pattern filtering on the `ACTED_IN` relationship type
+// tag::clauses_match_relationship[]
 [source, cypher]
 ----
 MATCH (:Movie {title: 'Wall Street'})<-[:ACTED_IN]-(actor:Person)
 RETURN actor.name AS actor
 ----
+// end::clauses_match_relationship[]
 
 .Result
 [source, role="queryresult",options="header,footer",cols="1*<m"]
@@ -260,11 +274,14 @@ RETURN actor.name AS actor
 It is possible to match a pattern containing one of several relationship types using the `OR` symbol, `|`.
 
 .Relationship pattern including either `ACTED_IN` or `DIRECTED` relationship types
+// tag::clauses_match_type_expression_or[]
 [source, cypher]
 ----
 MATCH (:Movie {title: 'Wall Street'})<-[:ACTED_IN|DIRECTED]-(person:Person)
 RETURN person.name AS person
 ----
+// end::clauses_match_type_expression_or[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -391,11 +408,13 @@ For more information about how to set parameters, see xref:syntax/parameters.ado
 The `MATCH` clause can also be used to bind whole paths to variables.
 
 .Find all paths matching a pattern
+// tag::clauses_match_path[]
 [source, cypher]
 ----
 MATCH path = ()-[:ACTED_IN]->(movie:Movie)
 RETURN path
 ----
+// end::clauses_match_path[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -541,7 +560,7 @@ RETURN directors
 1+d|Rows: 2
 |===
 
-.Match nodes dynamically using the `any()` function
+.Match nodes dynamically using `any()`
 [source, cypher]
 ----
 MATCH (n:$any(["Movie", "Actor"]))
@@ -572,11 +591,14 @@ RETURN n AS nodes
 ----
 
 .Match nodes dynamically using a parameter
+// tag::clauses_match_dynamic_match_parameter[]
 [source, cypher]
 ----
 MATCH (movie:$($label))
 RETURN movie.title AS movieTitle
 ----
+// end::clauses_match_dynamic_match_parameter[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -591,6 +613,7 @@ RETURN movie.title AS movieTitle
 
 
 .Match relationships dynamically using a variable
+// tag::clauses_match_dynamic_match_variable[]
 [source, cypher]
 ----
 CALL db.relationshipTypes()
@@ -598,6 +621,8 @@ YIELD relationshipType
 MATCH ()-[r:$(relationshipType)]->()
 RETURN relationshipType, count(r) AS relationshipCount
 ----
+// end::clauses_match_dynamic_match_variable[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
diff --git a/modules/ROOT/pages/clauses/merge.adoc b/modules/ROOT/pages/clauses/merge.adoc
index afb4b7533..61fa47b6c 100644
--- a/modules/ROOT/pages/clauses/merge.adoc
+++ b/modules/ROOT/pages/clauses/merge.adoc
@@ -713,6 +713,7 @@ This is because a relationship can only have exactly one type.
 ----
 
 .Merge nodes and relationships using dynamic node labels and relationship types
+// tag::clauses_merge_dynamic_merge[]
 [source, cypher]
 ----
 MERGE (greta:$($nodeLabels) {name: 'Greta Gerwig'})
@@ -721,6 +722,7 @@ UNWIND $movies AS movieTitle
 MERGE (greta)-[rel:$($relType)]->(m:Movie {title: movieTitle})
 RETURN greta.name AS name, labels(greta) AS labels, type(rel) AS relType, collect(m.title) AS movies
 ----
+// end::clauses_merge_dynamic_merge[]
 
 .Result
 [role="queryresult",options="footer",cols="4*<m"]
diff --git a/modules/ROOT/pages/clauses/optional-match.adoc b/modules/ROOT/pages/clauses/optional-match.adoc
index 44e2dba20..68289328a 100644
--- a/modules/ROOT/pages/clauses/optional-match.adoc
+++ b/modules/ROOT/pages/clauses/optional-match.adoc
@@ -79,12 +79,14 @@ This is because the second `MATCH` clause returns no data (there are no `DIRECTE
 However, replacing the second `MATCH` clause with `OPTIONAL MATCH` does return results.
 This is because, unlike `MATCH`, `OPTIONAL MATCH` enables the value `null` to be passed between clauses.
 
+// tag::clauses_optional_match[]
 [source, cypher]
 ----
 MATCH (p:Person {name: 'Martin Sheen'})
 OPTIONAL MATCH (p)-[r:DIRECTED]->()
 RETURN p.name, r
 ----
+// end::clauses_optional_match[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
diff --git a/modules/ROOT/pages/clauses/order-by.adoc b/modules/ROOT/pages/clauses/order-by.adoc
index 90ce90bb1..d863a26cc 100644
--- a/modules/ROOT/pages/clauses/order-by.adoc
+++ b/modules/ROOT/pages/clauses/order-by.adoc
@@ -39,12 +39,14 @@ CREATE
 `ORDER BY` is used to sort the output.
 
 .Query
+// tag::clauses_order_by[]
 [source, cypher]
 ----
 MATCH (n)
 RETURN n.name, n.age
 ORDER BY n.name
 ----
+// end::clauses_order_by[]
 
 The nodes are returned, sorted by their name.
 
@@ -66,12 +68,14 @@ You can order by multiple properties by stating each variable in the `ORDER BY`
 Cypher will sort the result by the first variable listed, and for equals values, go to the next property in the `ORDER BY` clause, and so on.
 
 .Query
+// tag::clauses_order_by_multiple[]
 [source, cypher]
 ----
 MATCH (n)
 RETURN n.name, n.age
 ORDER BY n.age, n.name
 ----
+// end::clauses_order_by_multiple[]
 
 This returns the nodes, sorted first by their age, and then by their name.
 
@@ -245,12 +249,14 @@ Read more about this capability in xref::indexes/search-performance-indexes/usin
 
 
 .Standalone use of `ORDER BY`
+// tag::clauses_order_by_standalone[]
 [source, cypher]
 ----
 MATCH (n)
 ORDER BY n.name
 RETURN collect(n.name) AS names
 ----
+// end::clauses_order_by_standalone[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -263,6 +269,7 @@ RETURN collect(n.name) AS names
 The following query orders all nodes by `name` descending, skips the first row and limits the results to one row.
 
 .`ORDER BY` used in conjunction with `SKIP` and `LIMIT`
+// tag::clauses_order_by_descending[]
 [source, cypher]
 ----
 MATCH (n)
@@ -271,6 +278,7 @@ SKIP 1
 LIMIT 1
 RETURN n.name AS name
 ----
+// end::clauses_order_by_descending[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
diff --git a/modules/ROOT/pages/clauses/return.adoc b/modules/ROOT/pages/clauses/return.adoc
index be9c233f9..93cbb17fd 100644
--- a/modules/ROOT/pages/clauses/return.adoc
+++ b/modules/ROOT/pages/clauses/return.adoc
@@ -32,11 +32,13 @@ CREATE
 To return a node, list it in the `RETURN` clause:
 
 .Query
+// tag::clauses_return_node[]
 [source, cypher]
 ----
 MATCH (p:Person {name: 'Keanu Reeves'})
 RETURN p
 ----
+// end::clauses_return_node[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -53,11 +55,13 @@ d|Rows: 1
 To return a relationship type, list it in the `RETURN` clause:
 
 .Query
+// tag::clauses_return_relationship_type[]
 [source, cypher]
 ----
 MATCH (p:Person {name: 'Keanu Reeves'})-[r:ACTED_IN]->(m)
 RETURN type(r)
 ----
+// end::clauses_return_relationship_type[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -74,11 +78,13 @@ d|Rows: 1
 To return a specific property, use the dot separator:
 
 .Query
+// tag::clauses_return_property[]
 [source, cypher]
 ----
 MATCH (p:Person {name: 'Keanu Reeves'})
 RETURN p.bornIn
 ----
+// end::clauses_return_property[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -101,11 +107,13 @@ This will improve performance.
 To return all nodes, relationships and paths found in a query, use the `*` symbol:
 
 .Query
+// tag::clauses_return_all_elements[]
 [source, cypher]
 ----
 MATCH p = (keanu:Person {name: 'Keanu Reeves'})-[r]->(m)
 RETURN *
 ----
+// end::clauses_return_all_elements[]
 
 This returns the two nodes, and the two possible paths between them.
 
@@ -149,11 +157,13 @@ d|Rows: 1
 Names of returned columns can be renamed using the `AS` operator:
 
 .Query
+// tag::clauses_return_with_column_alias[]
 [source, cypher]
 ----
 MATCH (p:Person {name: 'Keanu Reeves'})
 RETURN p.nationality AS citizenship
 ----
+// end::clauses_return_with_column_alias[]
 
 Returns the `nationality` property of `'Keanu Reeves'`, but the column is renamed to `citizenship`.
 
@@ -220,11 +230,13 @@ Returns a predicate, a literal and function call with a pattern expression param
 `DISTINCT` retrieves only unique rows for the columns that have been selected for output.
 
 .Query
+// tag::clauses_return_distinct[]
 [source, cypher]
 ----
 MATCH (p:Person {name: 'Keanu Reeves'})-->(m)
 RETURN DISTINCT m
 ----
+// end::clauses_return_distinct[]
 
 The `Movie` node `'Man of Tai Chi'` is returned by the query, but only once (without the `DISTINCT` operator it would have been returned twice because there are two relationships going to it from `'Keanu Reeves'`):
 
diff --git a/modules/ROOT/pages/clauses/skip.adoc b/modules/ROOT/pages/clauses/skip.adoc
index b4c4ecbee..b8436b80d 100644
--- a/modules/ROOT/pages/clauses/skip.adoc
+++ b/modules/ROOT/pages/clauses/skip.adoc
@@ -69,6 +69,7 @@ d|Rows: 2
 The following query returns the middle two rows, with `SKIP` skipping the first and xref:clauses/limit.adoc[`LIMIT`] removing the final two.
 
 .Query
+// tag::clauses_skip[]
 [source, cypher]
 ----
 MATCH (n)
@@ -77,6 +78,7 @@ ORDER BY n.name
 SKIP 1
 LIMIT 2
 ----
+// end::clauses_skip[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -126,12 +128,14 @@ d|Rows: 4
 `SKIP` can be used as a standalone clause, or in conjunction with xref:clauses/order-by.adoc[`ORDER BY`] or xref:clauses/limit.adoc[`LIMIT`].
 
 .Standalone use of `SKIP`
+// tag::clauses_skip_standalone[]
 [source, cypher]
 ----
 MATCH (n)
 SKIP 2
 RETURN collect(n.name) AS names
 ----
+// end::clauses_skip_standalone[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -169,6 +173,7 @@ RETURN collect(n.name) AS names
 `OFFSET` was introduced as part of Cypher's xref:appendix/gql-conformance/index.adoc[] and can be used as a synonym to `SKIP`.
 
 .Query
+// tag::clauses_skip_offset[]
 [source, cypher]
 ----
 MATCH (n)
@@ -177,6 +182,7 @@ OFFSET 2
 LIMIT 2
 RETURN collect(n.name) AS names
 ----
+// end::clauses_skip_offset[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
diff --git a/modules/ROOT/pages/clauses/unwind.adoc b/modules/ROOT/pages/clauses/unwind.adoc
index e2c3afc4a..55a739fd2 100644
--- a/modules/ROOT/pages/clauses/unwind.adoc
+++ b/modules/ROOT/pages/clauses/unwind.adoc
@@ -29,11 +29,13 @@ The `UNWIND` clause requires you to specify a new name for the inner values.
 We want to transform the literal list into rows named `x` and return them.
 
 .Query
+// tag::clauses_unwind_list[]
 [source, cypher]
 ----
 UNWIND [1, 2, 3, null] AS x
 RETURN x, 'val' AS y
 ----
+// end::clauses_unwind_list[]
 
 Each value of the original list -- including `null` -- is returned as an individual row.
 
@@ -109,6 +111,7 @@ The two lists -- _a_ and _b_ -- are concatenated to form a new list, which is th
 Multiple `UNWIND` clauses can be chained to unwind nested list elements.
 
 .Query
+// tag::clauses_unwind_nested_list[]
 [source, cypher]
 ----
 WITH [[1, 2], [3, 4], 5] AS nested
@@ -116,6 +119,7 @@ UNWIND nested AS x
 UNWIND x AS y
 RETURN y
 ----
+// end::clauses_unwind_nested_list[]
 
 The first `UNWIND` results in three rows for `x`, each of which contains an element of the original list (two of which are also lists); namely, `[1, 2]`, `[3, 4]`, and `5`.
 The second `UNWIND` then operates on each of these rows in turn, resulting in five rows for `y`.
@@ -212,6 +216,7 @@ Create a number of nodes and relationships from a parameter-list without using `
 ----
 
 .Query
+// tag::clauses_unwind_create_nodes[]
 [source, cypher]
 ----
 UNWIND $events AS event
@@ -219,6 +224,7 @@ MERGE (y:Year {year: event.year})
 MERGE (y)<-[:IN]-(e:Event {id: event.id})
 RETURN e.id AS x ORDER BY x
 ----
+// end::clauses_unwind_create_nodes[]
 
 Each value of the original list is unwound and passed through `MERGE` to find or create the nodes and relationships.
 
diff --git a/modules/ROOT/pages/clauses/use.adoc b/modules/ROOT/pages/clauses/use.adoc
index cb6552015..d20d4a1e9 100644
--- a/modules/ROOT/pages/clauses/use.adoc
+++ b/modules/ROOT/pages/clauses/use.adoc
@@ -81,14 +81,16 @@ CREATE ALIAS `myComposite`.`myConstituent` FOR DATABASE `myDatabase`;
 [[query-use-examples-query-graph]]
 === Query a graph
 
-In this example it is assumed that the DBMS contains a database named `myDatabase`:
+This example assumes that the DBMS contains a database named `myDatabase`:
 
 .Query
+// tag::clauses_use[]
 [source, cypher]
 ----
 USE myDatabase
 MATCH (n) RETURN n
 ----
+// end::clauses_use[]
 
 [[query-use-examples-query-composite-database-constituent-graph]]
 === Query a composite database constituent graph
@@ -96,11 +98,13 @@ MATCH (n) RETURN n
 In this example it is assumed that the DBMS contains a composite database named `myComposite`, which includes an alias named `myConstituent`:
 
 .Query
+// tag::clauses_use_composite[]
 [source, cypher]
 ----
 USE myComposite.myConstituent
 MATCH (n) RETURN n
 ----
+// end::clauses_use_composite[]
 
 
 [[query-use-examples-query-composite-database-constituent-graph-dynamically]]
diff --git a/modules/ROOT/pages/clauses/where.adoc b/modules/ROOT/pages/clauses/where.adoc
index cf976e4b7..8a34798f4 100644
--- a/modules/ROOT/pages/clauses/where.adoc
+++ b/modules/ROOT/pages/clauses/where.adoc
@@ -43,12 +43,14 @@ CREATE (andy:Swedish:Person {name: 'Andy', age: 36}),
 == Basic filtering
 
 .Filter on a node label
+// tag::clauses_where_in_match_clause[]
 [source, cypher]
 ----
 MATCH (n)
 WHERE n:Swedish
 RETURN n.name AS name
 ----
+// end::clauses_where_in_match_clause[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -79,12 +81,14 @@ RETURN n.name AS name, n.age AS age
 |===
 
 .Filter on a relationship property
+// tag::clauses_where_relationship_property[]
 [source, cypher]
 ----
 MATCH (:Person {name:'Andy'})-[k:KNOWS]->(f)
 WHERE k.since < 2000
 RETURN f.name AS oldFriend
 ----
+// end::clauses_where_relationship_property[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -148,6 +152,7 @@ The above query would work if the `RETURN` clause instead referenced the `name`
 However, because `WHERE` is a subclause and not a clause, its scope is not limited by immediately preceding `WITH` clauses.
 
 .`WHERE` is not limited by an immediately preceding `WITH`
+// tag::clauses_where_with[]
 [source, cypher]
 ----
 MATCH (n:Person)
@@ -155,6 +160,7 @@ WITH n.name as name
 WHERE n.age = 38
 RETURN name
 ----
+// end::clauses_where_with[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -201,11 +207,13 @@ When used this way, predicates in `WHERE` can reference the node variable that t
 The same rule applies to pattern comprehensions:
 
 .`WHERE` inside a pattern comprehension
+// tag::clauses_where_pattern_comprehension[]
 [source, cypher]
 ----
 MATCH (a:Person {name: 'Andy'})
 RETURN [(a)-->(b WHERE b:Person) | b.name] AS friends
 ----
+// end::clauses_where_pattern_comprehension[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
diff --git a/modules/ROOT/pages/clauses/with.adoc b/modules/ROOT/pages/clauses/with.adoc
index c8f655940..415a1f17b 100644
--- a/modules/ROOT/pages/clauses/with.adoc
+++ b/modules/ROOT/pages/clauses/with.adoc
@@ -88,12 +88,14 @@ In the below example, the `WITH` clause binds all matched `Customer` nodes to a
 The bound nodes are `MAP` values which can then be referenced from the new variable.
 
 .Create a new variable bound to matched nodes
+// tag::clauses_with_new_variable[]
 [source, cypher]
 ----
 MATCH (c:Customer)-[:BUYS]->(:Product {name: 'Chocolate'})
 WITH c AS customer
 RETURN customer.firstName AS chocolateCustomer
 ----
+// end::clauses_with_new_variable[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -136,6 +138,7 @@ Variable `p` not defined
 ----
 
 .Retain all variables with `WITH *`
+// tag::clauses_with_all_variables[]
 [source, cypher]
 ----
 MATCH (supplier:Supplier)-[r]->(product:Product)
@@ -144,6 +147,7 @@ RETURN supplier.name AS company,
        type(r) AS relType,
        product.name AS product
 ----
+// end::clauses_with_all_variables[]
 
 .Result
 [role="queryresult",options="header,footer",cols="3*<m"]
@@ -165,6 +169,7 @@ More specifically, a variable imported into a `CALL` subquery will be available
 In the below example, the `x` variable is imported to the inside scope of a `CALL` subquery, and is successfully referenced  by the `RETURN` clause even though the preceding `WITH` neglects to list it.
 
 .Variables cannot be de-scoped in the inner scope of a subquery
+// tag::clauses_with_subquery[]
 [source, cypher]
 ----
 WITH 11 AS x
@@ -175,6 +180,7 @@ CALL (x) {
 }
 RETURN x, a
 ----
+// end::clauses_with_subquery[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -196,6 +202,7 @@ For more information, see xref:subqueries/call-subquery.adoc#import-variables[`C
 In the below query, the value of the xref:expressions/string-operators.adoc[`STRING` concatenation] expression is bound to a new variable `customerFullName`, and the value from the expression `chocolate.price * (1 - customer.discount)` is bound to `chocolateNetPrice`, both of which are then available in the `RETURN` clause.
 
 .Bind values to variables
+// tag::clauses_with_bind_values[]
 [source, cypher]
 ----
 MATCH (customer:Customer)-[:BUYS]->(chocolate:Product {name: 'Chocolate'})
@@ -204,6 +211,7 @@ WITH customer.firstName || ' ' || customer.lastName AS customerFullName,
 RETURN customerFullName,
        chocolateNetPrice
 ----
+// end::clauses_with_bind_values[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -220,6 +228,7 @@ RETURN customerFullName,
 Because `WITH` can be used to assign variables to the values of expressions, it can be used to chain expressions.
 
 .Chain expressions using `WITH`
+// tag::clauses_with_chain_expressions[]
 [source, cypher]
 ----
 MATCH (p:Product)
@@ -236,6 +245,7 @@ RETURN p.name AS product,
        discountCategory
 ORDER BY price
 ----
+// end::clauses_with_chain_expressions[]
 
 .Result
 [role="queryresult",options="header,footer", cols="4*<m"]
@@ -263,6 +273,7 @@ In this example, the xref:functions/aggregating.adoc#functions-sum[`sum()`] func
 The xref:functions/aggregating.adoc#functions-collect[`collect()`] function is used to collect each product into  `LIST` values bound to the `productsBought` variable.
 
 .`WITH` performing aggregations
+// tag::clauses_with_aggregations[]
 [source, cypher]
 ----
 MATCH (c:Customer)-[:BUYS]->(p:Product)
@@ -274,6 +285,8 @@ RETURN customer,
        productsBought
 ORDER BY totalSpent DESC
 ----
+// end::clauses_with_aggregations[]
+
 
 .Result
 [role="queryresult",options="header,footer", cols="3*<m"]
@@ -299,6 +312,7 @@ ORDER BY totalSpent DESC
 In the below query, `WITH DISTINCT` is used to remove any duplicate `discount` property values from `Customer` nodes.
 
 .`WITH DISTINCT` to remove duplicate values
+// tag::clauses_with_remove_duplicates[]
 [source, cypher]
 ----
 MATCH (c:Customer)
@@ -306,6 +320,7 @@ WITH DISTINCT c.discount AS discountRates
 RETURN discountRates
 ORDER BY discountRates
 ----
+// end::clauses_with_remove_duplicates[]
 
 .Result
 [role="queryresult",options="header,footer", cols="1*<m"]
@@ -391,6 +406,7 @@ In the next example, `LIMIT` is used to only retain the top 3 customers with the
 Then, the xref:clauses/set.adoc[`SET`] assigns a new property (`topSpender = true`) to those customers who have spent the most.
 
 .Limit results with `LIMIT`
+// tag::clauses_with_ordering_pagination[]
 [source, cypher]
 ----
 MATCH (c:Customer)-[:BUYS]->(p:Product)
@@ -403,6 +419,7 @@ RETURN c.firstName AS customer,
        totalSpent,
        c.topSpender AS topSpender
 ----
+// end::clauses_with_ordering_pagination[]
 
 [role="queryresult",options="header,footer", cols="3*<m"]
 |===
@@ -505,6 +522,7 @@ In the below query, `WITH` and `WHERE` are used to filter out any `Supplier` nod
 Note the use of `DISTINCT` inside `collect()` to remove any duplicate `Customer` nodes.
 
 .Filter property values using `WITH` and `WHERE`
+// tag::clauses_with_filtering[]
 [source, cypher]
 ----
 MATCH (s:Supplier)-[:SUPPLIES]->(p:Product)<-[:BUYS]-(c:Customer)
@@ -516,6 +534,7 @@ RETURN s.name AS supplier,
        totalSales,
        uniqueCustomers
 ----
+// end::clauses_with_filtering[]
 
 [role="queryresult",options="header,footer", cols="3*<m"]
 |===
diff --git a/modules/ROOT/pages/functions/temporal/index.adoc b/modules/ROOT/pages/functions/temporal/index.adoc
index 3da0ab037..c0d00fb5e 100644
--- a/modules/ROOT/pages/functions/temporal/index.adoc
+++ b/modules/ROOT/pages/functions/temporal/index.adoc
@@ -482,7 +482,6 @@ RETURN theDate
 ======
 
 .Query
-// tag::functions_temporal_date_transaction[]
 [source, cypher]
 ----
 UNWIND [
@@ -492,7 +491,6 @@ date({year: 1984})
 ] AS theDate
 RETURN theDate
 ----
-// end::functions_temporal_date_transaction[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -569,7 +567,6 @@ The date corresponding to `11 February 1984` is returned.
 ======
 
 .Query
-// tag::functions_temporal_date_statement[]
 [source, cypher]
 ----
 UNWIND [
@@ -579,7 +576,6 @@ datetime({year: 1984, month: 11, day: 11, hour: 12, timezone: '+01:00'})
 ] AS dd
 RETURN date({date: dd}) AS dateOnly, date({date: dd, day: 28}) AS dateDay
 ----
-// end::functions_temporal_date_statement[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -709,10 +705,12 @@ However, a different value may be produced for different statements within the s
 ======
 
 .Query
+// tag::functions_temporal_date_statement[]
 [source, cypher]
 ----
 RETURN date.statement() AS currentDate
 ----
+// end::functions_temporal_date_statement[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -745,10 +743,13 @@ However, a different value may be produced for different transactions.
 ======
 
 .Query
+// tag::functions_temporal_date_transaction[]
 [source, cypher]
 ----
 RETURN date.transaction() AS currentDate
 ----
+// end::functions_temporal_date_transaction[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -800,6 +801,7 @@ For example, `day` -- with some value `x` -- may be provided when the truncation
 ======
 
 .Query
+// tag::functions_temporal_date_truncate[]
 [source, cypher]
 ----
 WITH
@@ -819,6 +821,8 @@ RETURN
   date.truncate('week', d, {dayOfWeek: 2}) AS truncWeek,
   date.truncate('day', d) AS truncDay
 ----
+// end::functions_temporal_date_truncate[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="9*<m"]
@@ -917,10 +921,12 @@ RETURN
 ======
 
 .Query
+// tag::functions_temporal_datetime[]
 [source, cypher]
 ----
 RETURN datetime() AS currentDateTime
 ----
+// end::functions_temporal_datetime[]
 
 The current date and time using the local timezone is returned.
 
@@ -1232,7 +1238,6 @@ RETURN
 The following query shows the various usages of `+datetime({datetime [, year, ..., timezone]})+`.
 
 .Query
-// tag::functions_temporal_datetime[]
 [source, cypher]
 ----
 WITH
@@ -1247,7 +1252,6 @@ RETURN
   datetime({datetime: dd, day: 28, second: 42}) AS dateTimeDDSS,
   datetime({datetime: dd, day: 28, second: 42, timezone: 'Pacific/Honolulu'}) AS dateTimeDDSSTimezone
 ----
-// end::functions_temporal_datetime[]
 
 .Result
 [role="queryresult",options="header,footer",cols="4*<m"]
@@ -1326,11 +1330,13 @@ RETURN datetime({epochMillis: 424797300000}) AS theDate
 ======
 
 .Query
+// tag::functions_temporal_datetime_fromepoch[]
 [source, cypher]
 ----
-WITH datetime.fromepoch(1683000000, 123456789) AS dateTimeFromEpoch
+WITH datetime.fromEpoch(1683000000, 123456789) AS dateTimeFromEpoch
 RETURN dateTimeFromEpoch
 ----
+// end::functions_temporal_datetime_fromepoch[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -1359,11 +1365,13 @@ RETURN dateTimeFromEpoch
 ======
 
 .Query
+// tag::functions_temporal_datetime_fromepochmillis
 [source, cypher]
 ----
-WITH datetime.fromepochmillis(1724198400000) AS dateTimeFromMillis
+WITH datetime.fromEpochMillis(1724198400000) AS dateTimeFromMillis
 RETURN dateTimeFromMillis
 ----
+// end::functions_temporal_datetime_fromepochmillis
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -1554,6 +1562,7 @@ For example, `day` -- with some value `x` -- may be provided when the truncation
 ======
 
 .Query
+// tag::functions_temporal_datetime_truncate[]
 [source, cypher]
 ----
 WITH
@@ -1570,6 +1579,7 @@ RETURN
   datetime.truncate('hour', d) AS truncHour,
   datetime.truncate('second', d) AS truncSecond
 ----
+// end::functions_temporal_datetime_truncate[]
 
 .Result
 [role="queryresult",options="header,footer",cols="6*<m"]
@@ -1659,12 +1669,10 @@ RETURN
 ======
 
 .Query
-// tag::functions_temporal_localtime[]
 [source, cypher]
 ----
 RETURN localdatetime() AS now
 ----
-// end::functions_temporal_localtime[]
 
 The current local date and time (i.e. in the local timezone) is returned.
 
@@ -1711,7 +1719,6 @@ The current local date and time in California is returned.
 ======
 
 .Query
-// tag::functions_temporal_localtime_transaction[]
 [source, cypher]
 ----
 RETURN
@@ -1720,7 +1727,6 @@ RETURN
     hour: 12, minute: 31, second: 14, millisecond: 123, microsecond: 456, nanosecond: 789
   }) AS theDate
 ----
-// end::functions_temporal_localtime_transaction[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -1764,7 +1770,6 @@ RETURN
 ======
 
 .Query
-// tag::functions_temporal_localtime_statement[]
 [source, cypher]
 ----
 RETURN
@@ -1773,7 +1778,6 @@ RETURN
     hour: 12, minute: 31, second: 14, nanosecond: 645876123
   }) AS theDate
 ----
-// end::functions_temporal_localtime_statement[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -1792,6 +1796,7 @@ RETURN
 ======
 
 .Query
+// tag::functions_temporal_localdatetime[]
 [source, cypher]
 ----
 RETURN
@@ -1800,6 +1805,7 @@ RETURN
     hour: 12, minute: 31, second: 14, microsecond: 645876
   }) AS theDate
 ----
+// end::functions_temporal_localdatetime[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -1850,7 +1856,6 @@ RETURN theDate
 The following query shows the various usages of `+localdatetime({date [, year, ..., nanosecond]})+`.
 
 .Query
-// tag::functions_temporal_localtime_realtime[]
 [source, cypher]
 ----
 WITH date({year: 1984, month: 10, day: 11}) AS dd
@@ -1858,7 +1863,6 @@ RETURN
   localdatetime({date: dd, hour: 10, minute: 10, second: 10}) AS dateHHMMSS,
   localdatetime({date: dd, day: 28, hour: 10, minute: 10, second: 10}) AS dateDDHHMMSS
 ----
-// end::functions_temporal_localtime_realtime[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -2139,6 +2143,7 @@ For example, `day` -- with some value `x` -- may be provided when the truncation
 ======
 
 .Query
+// tag::functions_temporal_localdatetime_truncate[]
 [source, cypher]
 ----
 WITH
@@ -2154,6 +2159,7 @@ RETURN
   localdatetime.truncate('hour', d, {nanosecond: 2}) AS truncHour,
   localdatetime.truncate('second', d) AS truncSecond
 ----
+// end::functions_temporal_localdatetime_truncate[]
 
 .Result
 [role="queryresult",options="header,footer",cols="6*<m"]
@@ -2228,10 +2234,12 @@ RETURN
 ======
 
 .Query
+// tag::functions_temporal_localtime[]
 [source, cypher]
 ----
 RETURN localtime() AS now
 ----
+// end::functions_temporal_localtime[]
 
 The current local time (i.e. in the local timezone) is returned.
 
@@ -2252,12 +2260,10 @@ The current local time (i.e. in the local timezone) is returned.
 ======
 
 .Query
-// tag::functions_temporal_time[]
 [source, cypher]
 ----
 RETURN localtime({timezone: 'America/Los Angeles'}) AS nowInLA
 ----
-// end::functions_temporal_time[]
 
 The current local time in California is returned.
 
@@ -2339,7 +2345,6 @@ RETURN theTime
 ======
 
 .Query
-// tag::functions_temporal_time_transaction[]
 [source, cypher]
 ----
 WITH time({hour: 12, minute: 31, second: 14, microsecond: 645876, timezone: '+01:00'}) AS tt
@@ -2347,7 +2352,6 @@ RETURN
   localtime({time: tt}) AS timeOnly,
   localtime({time: tt, second: 42}) AS timeSS
 ----
-// end::functions_temporal_time_transaction[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -2380,10 +2384,12 @@ The returned `LOCAL TIME`  will be the live clock of the system.
 ======
 
 .Query
+// tag::functions_temporal_localtime_realtime[]
 [source, cypher]
 ----
 RETURN localtime.realtime() AS now
 ----
+// end::functions_temporal_localtime_realtime[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -2416,12 +2422,12 @@ However, a different value may be produced for different statements within the s
 ======
 
 .Query
-// tag::functions_temporal_time_statement[]
+// tag::functions_temporal_localtime_statement[]
 [source, cypher]
 ----
 RETURN localtime.statement() AS now
 ----
-// end::functions_temporal_time_statement[]
+// end::functions_temporal_localtime_statement[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -2477,10 +2483,12 @@ However, a different value may be produced for different transactions.
 ======
 
 .Query
+// tag::functions_temporal_localtime_transaction[]
 [source, cypher]
 ----
 RETURN localtime.transaction() AS now
 ----
+// end::functions_temporal_localtime_transaction[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -2534,7 +2542,7 @@ However, the timezone of `input` is retained.
 ======
 
 .Query
-// tag::functions_temporal_time_realtime[]
+// tag::functions_temporal_localtime_truncate[]
 [source, cypher]
 ----
 WITH time({hour: 12, minute: 31, second: 14, nanosecond: 645876123, timezone: '-01:00'}) AS t
@@ -2546,7 +2554,7 @@ RETURN
   localtime.truncate('millisecond', t) AS truncMillisecond,
   localtime.truncate('microsecond', t) AS truncMicrosecond
 ----
-// end::functions_temporal_time_realtime[]
+// end::functions_temporal_localtime_truncate[]
 
 .Result
 [role="queryresult",options="header,footer",cols="6*<m"]
@@ -2629,10 +2637,13 @@ RETURN
 ======
 
 .Query
+// tag::functions_temporal_time[]
 [source, cypher]
 ----
 RETURN time() AS currentTime
 ----
+// end::functions_temporal_time[]
+
 
 The current time of day using the local timezone is returned.
 
@@ -2792,10 +2803,13 @@ The returned `ZONED TIME` will be the live clock of the system.
 ======
 
 .Query
+// tag::functions_temporal_time_realtime[]
 [source, cypher]
 ----
 RETURN time.realtime() AS currentTime
 ----
+// end::functions_temporal_time_realtime[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -2828,10 +2842,12 @@ However, a different value may be produced for different statements within the s
 ======
 
 .Query
+// tag::functions_temporal_time_statement[]
 [source, cypher]
 ----
 RETURN time.statement() AS currentTime
 ----
+// end::functions_temporal_time_statement[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -2887,10 +2903,13 @@ However, a different value may be produced for different transactions.
 ======
 
 .Query
+// tag::functions_temporal_time_transaction[]
 [source, cypher]
 ----
 RETURN time.transaction() AS currentTime
 ----
+// end::functions_temporal_time_transaction[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -2942,6 +2961,7 @@ For example, `minute` -- with some value `x` -- may be provided when the truncat
 ======
 
 .Query
+// tag::functions_temporal_time_truncate[]
 [source, cypher]
 ----
 WITH time({hour: 12, minute: 31, second: 14, nanosecond: 645876123, timezone: '-01:00'}) AS t
@@ -2953,6 +2973,7 @@ RETURN
   time.truncate('millisecond', t, {nanosecond: 2}) AS truncMillisecond,
   time.truncate('microsecond', t) AS truncMicrosecond
 ----
+// end::functions_temporal_time_truncate[]
 
 .Result
 [role="queryresult",options="header,footer",cols="6*<m"]
diff --git a/modules/ROOT/pages/patterns/fixed-length-patterns.adoc b/modules/ROOT/pages/patterns/fixed-length-patterns.adoc
index bd1ac5799..c6ceb9ad1 100644
--- a/modules/ROOT/pages/patterns/fixed-length-patterns.adoc
+++ b/modules/ROOT/pages/patterns/fixed-length-patterns.adoc
@@ -57,10 +57,14 @@ MATCH (n { mode: 'Rail' })
 More general predicates can be expressed with a `WHERE` clause.
 The following matches nodes whose name property starts with `Preston`:
 
-[source, role=noheader]
+// tag::patterns_fixed_length_patterns_node_pattern[]
+[source, cypher]
 ----
 MATCH (n:Station WHERE n.name STARTS WITH 'Preston')
+RETURN n
 ----
+// end::patterns_fixed_length_patterns_node_pattern[]
+
 
 See the xref:patterns/reference.adoc#node-patterns[node patterns] reference section for more details.
 
@@ -204,11 +208,13 @@ In order to return the name of each `Stop` that calls at a `Station`, declare a
 The results will then have a row containing the departs value of each `Stop` for each match shown above:
 
 .Query
+// tag::patterns_fixed_length_patterns_path_pattern[]
 [source, cypher]
 ----
 MATCH (s:Stop)-[:CALLS_AT]->(:Station {name: 'Denmark Hill'})
 RETURN s.departs AS departureTime
 ----
+// end::patterns_fixed_length_patterns_path_pattern[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
diff --git a/modules/ROOT/pages/patterns/non-linear-patterns.adoc b/modules/ROOT/pages/patterns/non-linear-patterns.adoc
index 3f592e3bb..595dc307e 100644
--- a/modules/ROOT/pages/patterns/non-linear-patterns.adoc
+++ b/modules/ROOT/pages/patterns/non-linear-patterns.adoc
@@ -62,6 +62,7 @@ image::patterns_equijoins_motif2.svg[width="700",role="middle"]
 Putting this path pattern with an equijoin in a query, the times of the outbound and return journeys can be returned:
 
 .Query
+// tag::patterns_non_linear_patterns_equijoin[]
 [source, cypher]
 ----
 MATCH (n:Station {name: 'London Euston'})<-[:CALLS_AT]-(s1:Stop)
@@ -70,6 +71,8 @@ MATCH (n:Station {name: 'London Euston'})<-[:CALLS_AT]-(s1:Stop)
 RETURN s1.departs+'-'+s2.departs AS outbound,
   s3.departs+'-'+s4.departs AS `return`
 ----
+// end::patterns_non_linear_patterns_equijoin[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -181,6 +184,7 @@ The other node variables are for the `WHERE` clause or for returning data.
 Putting this together, the resulting query returns the earliest arrival time achieved by switching to an express service:
 
 .Query
+// tag::patterns_non_linear_patterns_graph_pattern[]
 [source, cypher]
 ----
 MATCH (:Station {name: 'Starbeck'})<-[:CALLS_AT]-
@@ -197,6 +201,8 @@ RETURN a.departs AS departs,
        y.arrives AS arrives
 ORDER BY y.arrives LIMIT 1
 ----
+// end::patterns_non_linear_patterns_graph_pattern[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="4*<m"]
diff --git a/modules/ROOT/pages/patterns/shortest-paths.adoc b/modules/ROOT/pages/patterns/shortest-paths.adoc
index 7e28790d8..441032ce5 100644
--- a/modules/ROOT/pages/patterns/shortest-paths.adoc
+++ b/modules/ROOT/pages/patterns/shortest-paths.adoc
@@ -68,12 +68,14 @@ The paths matched by a xref:patterns/fixed-length-patterns.adoc#path-patterns[pa
 For example, the following example uses `SHORTEST 1` to return the length of the shortest path between `Worcester Shrub Hill` and `Bromsgrove`:
 
 .Query
+// tag::patterns_shortest_paths_shortest_k[]
 [source, cypher]
 ----
 MATCH p = SHORTEST 1 (wos:Station)-[:LINK]-+(bmv:Station)
 WHERE wos.name = "Worcester Shrub Hill" AND bmv.name = "Bromsgrove"
 RETURN length(p) AS result
 ----
+// end::patterns_shortest_paths_shortest_k[]
 
 [NOTE]
 Note that this and the following examples in this section use a quantified relationship `-[:LINK]-\+`, which is composed of a relationship pattern `-[:LINK]-` and a postfix quantifier `+`.
@@ -160,12 +162,14 @@ If there had been only four possible paths between the two Stations, then only t
 To return all paths that are tied for shortest length, use the keywords `ALL SHORTEST`:
 
 .Query
+// tag::patterns_shortest_paths_all_shortest[]
 [source,cypher]
 ----
 MATCH p = ALL SHORTEST (wos:Station)-[:LINK]-+(bmv:Station)
 WHERE wos.name = "Worcester Shrub Hill" AND bmv.name = "Bromsgrove"
 RETURN [n in nodes(p) | n.name] AS stops
 ----
+// end::patterns_shortest_paths_all_shortest[]
 
 .Result
 [role="queryresult",options="header,footer",cols="m"]
@@ -187,12 +191,14 @@ To return all paths that are tied for first, second, and so on up to the kth sho
 For example, the following returns the first and second shortest length paths between  `Worcester Shrub Hill` and `Bromsgrove`:
 
 .Query
+// tag::patterns_shortest_paths_shortest_k_groups[]
 [source,cypher]
 ----
 MATCH p = SHORTEST 2 GROUPS (wos:Station)-[:LINK]-+(bmv:Station)
 WHERE wos.name = "Worcester Shrub Hill" AND bmv.name = "Bromsgrove"
 RETURN [n in nodes(p) | n.name] AS stops, length(p) AS pathLength
 ----
+// end::patterns_shortest_paths_shortest_k_groups[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2m,m"]
@@ -243,12 +249,14 @@ It returns the same as `SHORTEST 1`, but by using the `ANY` keyword the intent o
 For example, the following query shows that there exists a route from `Pershore` to `Bromsgrove` where the distance between each pair of stations is less than 10 miles:
 
 .Query
+// tag::patterns_shortest_paths_any[]
 [source,cypher]
 ----
 MATCH path = ANY
   (:Station {name: 'Pershore'})-[l:LINK WHERE l.distance < 10]-+(b:Station {name: 'Bromsgrove'})
 RETURN [r IN relationships(path) | r.distance] AS distances
 ----
+// end::patterns_shortest_paths_any[]
 
 .Result
 [role="queryresult",options="header,footer",cols="m"]
diff --git a/modules/ROOT/pages/patterns/variable-length-patterns.adoc b/modules/ROOT/pages/patterns/variable-length-patterns.adoc
index 7794f8914..af661f964 100644
--- a/modules/ROOT/pages/patterns/variable-length-patterns.adoc
+++ b/modules/ROOT/pages/patterns/variable-length-patterns.adoc
@@ -172,6 +172,7 @@ Translating the union of fixed-length path patterns into a quantified path patte
 The following query adds a `RETURN` clause that yields the departure and arrival times of the two services:
 
 .Query
+// tag::patterns_variable_length_patterns_qpp[]
 [source, cypher]
 ----
 MATCH (:Station { name: 'Denmark Hill' })<-[:CALLS_AT]-(d:Stop)
@@ -179,6 +180,8 @@ MATCH (:Station { name: 'Denmark Hill' })<-[:CALLS_AT]-(d:Stop)
       (a:Stop)-[:CALLS_AT]->(:Station { name: 'Clapham Junction' })
 RETURN d.departs AS departureTime, a.arrives AS arrivalTime
 ----
+// end::patterns_variable_length_patterns_qpp[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -227,6 +230,7 @@ A quantified relationship is a relationship pattern with a postfix quantifier.
 Below is the previous query rewritten with a quantified relationship:
 
 .Query
+// tag::patterns_variable_length_patterns_quantified_relationships[]
 [source, cypher]
 ----
 MATCH (d:Station { name: 'Denmark Hill' })<-[:CALLS_AT]-
@@ -235,6 +239,8 @@ MATCH (d:Station { name: 'Denmark Hill' })<-[:CALLS_AT]-
 WHERE m.arrives < time('17:18')
 RETURN n.departs AS departureTime
 ----
+// end::patterns_variable_length_patterns_quantified_relationships[]
+
 
 The scope of the quantifier `{1,10}` is the relationship pattern `-[:NEXT]\->` and not the node patterns abutting it.
 More generally, where a path pattern contained in a quantified path pattern has the following form:
@@ -523,6 +529,7 @@ In this example, an inline predicate can be added that takes advantage of the ge
 To compose the predicate, the xref:functions/spatial.adoc#functions-distance[point.distance()] function is used to compare the distance between the left-hand `Station` (`a`) and the right-hand `Station` (`b`) for each node-pair along the path to the destination `North Dulwich`:
 
 .Query
+// tag::patterns_variable_length_patterns_predicates_in_qpp[]
 [source,cypher]
 ----
 MATCH (bfr:Station {name: "London Blackfriars"}),
@@ -534,6 +541,8 @@ MATCH p = (bfr)
 RETURN reduce(acc = 0, r in relationships(p) | round(acc + r.distance, 2))
   AS distance
 ----
+// end::patterns_variable_length_patterns_predicates_in_qpp[]
+
 
 .Result
 [role="queryresult",options="header,footer",cols="m"]
diff --git a/modules/ROOT/pages/queries/composed-queries/combined-queries.adoc b/modules/ROOT/pages/queries/composed-queries/combined-queries.adoc
index 6a54e224f..63c0aa0d1 100644
--- a/modules/ROOT/pages/queries/composed-queries/combined-queries.adoc
+++ b/modules/ROOT/pages/queries/composed-queries/combined-queries.adoc
@@ -45,6 +45,7 @@ CREATE (johnny:Actor {name: 'Johnny Depp'}),
 Combining the results from two queries is done using `UNION ALL`.
 
 .Query
+// tag::clauses_union_all[]
 [source, cypher]
 ----
 MATCH (n:Actor)
@@ -53,6 +54,7 @@ UNION ALL
 MATCH (n:Movie)
 RETURN n.title AS name
 ----
+// end::clauses_union_all[]
 
 The combined result is returned, including duplicates.
 
@@ -74,6 +76,7 @@ The combined result is returned, including duplicates.
 By not including `ALL` in the `UNION`, duplicates are removed from the combined result set.
 
 .Query
+// tag::clauses_union[]
 [source, cypher]
 ----
 MATCH (n:Actor)
@@ -82,6 +85,7 @@ UNION
 MATCH (n:Movie)
 RETURN n.title AS name
 ----
+// end::clauses_union[]
 
 The combined result is returned, without duplicates.