diff --git a/modules/ROOT/pages/clauses/finish.adoc b/modules/ROOT/pages/clauses/finish.adoc
index b233b4896..2d3315e13 100644
--- a/modules/ROOT/pages/clauses/finish.adoc
+++ b/modules/ROOT/pages/clauses/finish.adoc
@@ -3,17 +3,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 cc29cf861..0fee1e0ce 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 ebf126222..03faf9a30 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"]
@@ -705,10 +709,11 @@ person_tmdbId,bio,born,bornIn,died,person_imdbId,name,person_poster,person_url
 ----
 
 [NOTE]
-The below query uses a xref:subqueries/call-subquery.adoc#variable-scope-clause[variable scope clause] (introduced in Neo4j 5.23) to import variables into the `CALL` subquery.
+The query below uses a xref:subqueries/call-subquery.adoc#variable-scope-clause[variable scope clause] (introduced in Neo4j 5.23) to import variables into the `CALL` subquery.
 If you are using an older version of Neo4j, use an xref:subqueries/call-subquery.adoc#importing-with[importing `WITH` clause] instead.
 
 .Query
+// tag::clauses_load_csv_transactions[]
 [source, cypher]
 ----
 LOAD CSV WITH HEADERS FROM 'https://data.neo4j.com/importing-cypher/persons.csv' AS row
@@ -717,6 +722,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"]
@@ -751,11 +757,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"]
@@ -786,11 +794,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"]
@@ -837,6 +847,7 @@ Id,Name,Year
 ----
 
 .Query
+// tag::clauses_load_csv_headers[]
 [source, cypher]
 ----
 LOAD CSV WITH HEADERS FROM 'file:///artists-with-headers.csv' AS row
@@ -845,6 +856,7 @@ RETURN
   a.name AS name,
   a.year AS year
 ----
+// end::clauses_load_csv_headers[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -880,11 +892,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 dbf136f4a..3dffc1a0c 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"]
@@ -195,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].
@@ -244,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"]
@@ -400,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"]
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 feb5bb766..6136a5b63 100644
--- a/modules/ROOT/pages/clauses/order-by.adoc
+++ b/modules/ROOT/pages/clauses/order-by.adoc
@@ -40,12 +40,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.
 
@@ -67,12 +69,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.
 
@@ -246,12 +250,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"]
@@ -264,6 +270,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)
@@ -272,6 +279,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 323fc40cd..f62810787 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 2f31a9f49..47961fd50 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/union.adoc b/modules/ROOT/pages/clauses/union.adoc
index 2df4687aa..89c9746a8 100644
--- a/modules/ROOT/pages/clauses/union.adoc
+++ b/modules/ROOT/pages/clauses/union.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.
 
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 1d5643469..43959819f 100644
--- a/modules/ROOT/pages/clauses/use.adoc
+++ b/modules/ROOT/pages/clauses/use.adoc
@@ -68,14 +68,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
@@ -83,11 +85,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 f57792c60..c0487cb30 100644
--- a/modules/ROOT/pages/clauses/where.adoc
+++ b/modules/ROOT/pages/clauses/where.adoc
@@ -46,12 +46,14 @@ CREATE
 `WHERE` can appear inside a node pattern in a `MATCH` clause or a pattern comprehension:
 
 .Query
+// tag::clauses_where_in_match_clause[]
 [source, cypher]
 ----
 WITH 30 AS minAge
 MATCH (a:Person WHERE a.name = 'Andy')-[:KNOWS]->(b:Person WHERE b.age > minAge)
 RETURN b.name
 ----
+// end::clauses_where_in_match_clause[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -66,11 +68,13 @@ When used this way, predicates in `WHERE` can reference the node variable that t
 The same rule applies to pattern comprehensions:
 
 .Query
+// 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"]
@@ -87,6 +91,7 @@ The following boolean operators can be used with the `WHERE` clause: `AND`, `OR`
 For more information on how operators work with `null`, see the chapter on xref::values-and-types/working-with-null.adoc[Working with null].
 
 .Query
+// tag::clauses_where_boolean_operations[]
 [source, cypher]
 ----
 MATCH (n:Person)
@@ -96,6 +101,7 @@ RETURN
   n.age AS age
 ORDER BY name
 ----
+// end::clauses_where_boolean_operations[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
@@ -114,12 +120,14 @@ ORDER BY name
 To filter nodes by label, write a label predicate after the `WHERE` keyword using `WHERE n:foo`:
 
 .Query
+// tag::clauses_where_node_label[]
 [source, cypher]
 ----
 MATCH (n)
 WHERE n:Swedish
 RETURN n.name, n.age
 ----
+// end::clauses_where_node_label[]
 
 The `name` and `age` values for `Andy` are returned:
 
@@ -138,12 +146,14 @@ The `name` and `age` values for `Andy` are returned:
 To filter on a node property, write your clause after the `WHERE` keyword:
 
 .Query
+// tag::clauses_where_node_property[]
 [source, cypher]
 ----
 MATCH (n:Person)
 WHERE n.age < 30
 RETURN n.name, n.age
 ----
+// end::clauses_where_node_property[]
 
 The `name` and `age` values for `Timothy` are returned because he is less than 30 years of age:
 
@@ -162,12 +172,14 @@ The `name` and `age` values for `Timothy` are returned because he is less than 3
 To filter on a relationship property, write your clause after the `WHERE` keyword:
 
 .Query
+// tag::clauses_where_relationship_property[]
 [source, cypher]
 ----
 MATCH (n:Person)-[k:KNOWS]->(f)
 WHERE k.since < 2000
 RETURN f.name, f.age, f.email
 ----
+// end::clauses_where_relationship_property[]
 
 The `name`, `age` and `email` values for `Peter` are returned because `Andy` has known him since before 2000:
 
@@ -218,12 +230,14 @@ The `name` and `age` values for `Timothy` are returned because he is less than 3
 Use the `IS NOT NULL` predicate to only include nodes or relationships in which a property exists:
 
 .Query
+// tag::clauses_where_property_existence[]
 [source, cypher]
 ----
 MATCH (n:Person)
 WHERE n.belt IS NOT NULL
 RETURN n.name, n.belt
 ----
+// end::clauses_where_property_existence[]
 
 The `name` and `belt` values for `Andy` are returned because he is the only one with a `belt` property:
 
@@ -242,6 +256,7 @@ The `name` and `belt` values for `Andy` are returned because he is the only one
 As `WHERE` is not considered a clause in its own right, its scope is not limited by a `WITH` directly before it.
 
 .Query
+// tag::clauses_where_with[]
 [source, cypher]
 ----
 MATCH (n:Person)
@@ -249,6 +264,7 @@ WITH n.name as name
 WHERE n.age = 25
 RETURN name
 ----
+// end::clauses_where_with[]
 
 .Result
 [role="queryresult",options="header,footer",cols="1*<m"]
@@ -538,6 +554,7 @@ The following sections will demonstrate how to use path pattern expressions in a
 === Filter on patterns
 
 .Query
+// tag::clauses_where_patterns[]
 [source, cypher]
 ----
 MATCH
@@ -546,6 +563,7 @@ MATCH
 WHERE (other)-->(timothy)
 RETURN other.name, other.age
 ----
+// end::clauses_where_patterns[]
 
 The `name` and `age` values for nodes that have an outgoing relationship to `Timothy` are returned:
 
@@ -618,12 +636,14 @@ To check if an element exists in a list, use the `IN` operator.
 The below query checks whether a property exists in a literal list:
 
 .Query
+// tag::clauses_where_lists[]
 [source, cypher]
 ----
 MATCH (a:Person)
 WHERE a.name IN ['Peter', 'Timothy']
 RETURN a.name, a.age
 ----
+// end::clauses_where_lists[]
 
 .Result
 [role="queryresult",options="header,footer",cols="2*<m"]
diff --git a/modules/ROOT/pages/clauses/with.adoc b/modules/ROOT/pages/clauses/with.adoc
index 0aa2b0952..c2939fa21 100644
--- a/modules/ROOT/pages/clauses/with.adoc
+++ b/modules/ROOT/pages/clauses/with.adoc
@@ -56,6 +56,7 @@ CREATE
 You can introduce new variables for the result of evaluating expressions.
 
 .Query
+// tag::clauses_with_variables[]
 [source, cypher, indent=0]
 ----
 MATCH (george {name: 'George'})<--(otherPerson)
@@ -63,6 +64,7 @@ WITH otherPerson, toUpper(otherPerson.name) AS upperCaseName
 WHERE upperCaseName STARTS WITH 'C'
 RETURN otherPerson.name
 ----
+// end::clauses_with_variables[]
 
 This query returns the name of persons connected to *'George'* whose name starts with a `C`, regardless of capitalization.
 
@@ -81,12 +83,14 @@ This query returns the name of persons connected to *'George'* whose name starts
 You can use the wildcard `*` to carry over all variables that are in scope, in addition to introducing new variables.
 
 .Query
+// tag::clauses_with_wildcard[]
 [source, cypher, indent=0]
 ----
 MATCH (person)-[r]->(otherPerson)
 WITH *, type(r) AS connectionType
 RETURN person.name, otherPerson.name, connectionType
 ----
+// end::clauses_with_wildcard[]
 
 This query returns the names of all related persons and the type of relationship between them.