diff --git a/modules/ROOT/content-nav.adoc b/modules/ROOT/content-nav.adoc
index 35d451b4d..d6ea0bd0d 100644
--- a/modules/ROOT/content-nav.adoc
+++ b/modules/ROOT/content-nav.adoc
@@ -116,7 +116,7 @@
 ** xref:syntax/parsing.adoc[]
 ** xref:syntax/naming.adoc[]
 ** xref:syntax/variables.adoc[]
-** xref:syntax/reserved.adoc[]
+** xref:syntax/keywords.adoc[]
 ** xref:syntax/parameters.adoc[]
 ** xref:syntax/operators.adoc[]
 ** xref:syntax/comments.adoc[]
diff --git a/modules/ROOT/pages/appendix/gql-conformance/unsupported-mandatory.adoc b/modules/ROOT/pages/appendix/gql-conformance/unsupported-mandatory.adoc
index 98c143dcb..019c73efc 100644
--- a/modules/ROOT/pages/appendix/gql-conformance/unsupported-mandatory.adoc
+++ b/modules/ROOT/pages/appendix/gql-conformance/unsupported-mandatory.adoc
@@ -41,5 +41,5 @@ Cypher Shell also offers specific link:{neo4j-docs-base-uri}/operations-manual/{
 | 21.3
 | <token>, <separator>, and <identifier>
 | GQL specifies a list of link:https://standards.iso.org/iso-iec/39075/ed-1/en/ISO_IEC_39075(en).bnf.txt[reserved words] that cannot be used for unquoted variable names, labels, and property names.
-Cypher also specifies a list of xref:syntax/reserved.adoc[reserved keywords], but it differs from GQL's.
+Cypher also specifies a list of xref:syntax/keywords.adoc[reserved keywords], but it differs from GQL's.
 |===
\ No newline at end of file
diff --git a/modules/ROOT/pages/syntax/index.adoc b/modules/ROOT/pages/syntax/index.adoc
index 498839606..04a664be0 100644
--- a/modules/ROOT/pages/syntax/index.adoc
+++ b/modules/ROOT/pages/syntax/index.adoc
@@ -8,7 +8,7 @@ Further information can be found in the following sections:
 * xref::syntax/parsing.adoc[Parsing]
 * xref::syntax/naming.adoc[Naming rules and recommendations]
 * xref::syntax/variables.adoc[Variables]
-* xref::syntax/reserved.adoc[Reserved keywords]
+* xref::syntax/keywords.adoc[Keywords]
 * xref::syntax/parameters.adoc[Parameters]
 * xref::syntax/operators.adoc[Operators]
 * xref::syntax/comments.adoc[Comments]
diff --git a/modules/ROOT/pages/syntax/keywords.adoc b/modules/ROOT/pages/syntax/keywords.adoc
new file mode 100644
index 000000000..aafb711f2
--- /dev/null
+++ b/modules/ROOT/pages/syntax/keywords.adoc
@@ -0,0 +1,394 @@
+:description: This section contains a list of reserved keywords in Cypher.
+
+[[cypher-keywords]]
+= Keywords
+
+Keywords are words with a predefined meaning in Cypher.
+
+Keywords are not recommended to be used as identifiers in the following contexts:
+
+* Variables
+* Labels
+* Relationship types
+* Function names
+* Procedure names
+
+If a snippet of Cypher can both be a keyword and an unquoted identifier, it is interpreted as a keyword.
+
+For instance in the following, `true` could be the variable `true` or the Boolean literal value `true`. Since `true` is a keyword, the query returns a single Boolean `true` value.
+
+.Query
+[source, cypher, role=test-result-skip]
+----
+WITH 123 AS true
+RETURN true AS x
+----
+
+.Result
+[role="queryresult",options="header,footer",cols="1*<m"]
+|===
+| x
+
+| true
+
+1+d|Rows: 1
+|===
+
+If any keyword is quoted in backticks (```), such as `++`true`++`, it is always interpreted as an identifier in the given context.
+
+.Query
+[source, cypher, role=test-result-skip]
+----
+WITH 123 AS true
+RETURN `true` AS x
+----
+
+.Result
+[role="queryresult",options="header,footer",cols="1*<m"]
+|===
+| x
+
+| 123
+
+1+d|Rows: 1
+|===
+
+
+== List of keywords
+
+The following lists all keywords in Cypher.
+
+Note that with future functionality, Cypher may be extended with additional keywords.
+
+=== A
+
+* `ACCESS`
+* `ACTIVE`
+* `ADMIN`
+* `ADMINISTRATOR`
+* `ALIAS`
+* `ALIASES`
+* `ALL`
+* `ALL_SHORTEST_PATHS`
+* `ALTER`
+* `AND`
+* `ANY`
+* `ARRAY`
+* `AS`
+* `ASC`
+* `ASCENDING`
+* `ASSIGN`
+* `AT`
+* `AUTH`
+
+=== B
+
+* `BINDINGS`
+* `BOOL`
+* `BOOLEAN`
+* `BOOSTED`
+* `BOTH`
+* `BREAK`
+* `BUILT`
+* `BY`
+
+=== C
+
+* `CALL`
+* `CASCADE`
+* `CASE`
+* `CHANGE`
+* `CIDR`
+* `COLLECT`
+* `COMMAND`
+* `COMMANDS`
+* `COMPOSITE`
+* `CONCURRENT`
+* `CONSTRAINT`
+* `CONSTRAINTS`
+* `CONTAINS`
+* `CONTINUE`
+* `COPY`
+* `COUNT`
+* `CREATE`
+* `CSV`
+* `CURRENT`
+
+=== D
+
+* `DATA`
+* `DATABASE`
+* `DATABASES`
+* `DATE`
+* `DATETIME`
+* `DBMS`
+* `DEALLOCATE`
+* `DEFAULT`
+* `DEFINED`
+* `DELETE`
+* `DENY`
+* `DESC`
+* `DESCENDING`
+* `DESTROY`
+* `DETACH`
+* `DIFFERENT`
+* `DISTINCT`
+* `DRIVER`
+* `DROP`
+* `DRYRUN`
+* `DUMP`
+* `DURATION`
+
+=== E
+
+* `EACH`
+* `EDGE`
+* `ELEMENT`
+* `ELEMENTS`
+* `ELSE`
+* `ENABLE`
+* `ENCRYPTED`
+* `END`
+* `ENDS`
+* `ERROR`
+* `EXECUTABLE`
+* `EXECUTE`
+* `EXIST`
+* `EXISTENCE`
+* `EXISTS`
+
+=== F
+
+* `FAIL`
+* `FALSE`
+* `FIELDTERMINATOR`
+* `FINISH`
+* `FLOAT`
+* `FOR`
+* `FOREACH`
+* `FROM`
+* `FULLTEXT`
+* `FUNCTION`
+* `FUNCTIONS`
+
+=== G, H
+
+* `GRANT`
+* `GRAPH`
+* `GRAPHS`
+* `GROUP`
+* `GROUPS`
+
+//
+
+* `HEADERS`
+* `HOME`
+
+=== I
+
+* `ID`
+* `IF`
+* `IMMUTABLE`
+* `IMPERSONATE`
+* `IN`
+* `INDEX`
+* `INDEXES`
+* `INF`
+* `INFINITY`
+* `INSERT`
+* `INT`
+* `INTEGER`
+* `IS`
+
+=== J, K, L, M
+
+* `JOIN`
+
+//
+
+* `KEY`
+
+//
+
+* `LABEL`
+* `LABELS`
+* `LEADING`
+* `LIMITROWS`
+* `LIST`
+* `LOAD`
+* `LOCAL`
+* `LOOKUP`
+
+//
+
+* `MANAGEMENT`
+* `MAP`
+* `MATCH`
+* `MERGE`
+
+=== N
+
+* `NAME`
+* `NAMES`
+* `NAN`
+* `NEW`
+* `NFC`
+* `NFD`
+* `NFKC`
+* `NFKD`
+* `NODE`
+* `NODES`
+* `NODETACH`
+* `NONE`
+* `NORMALIZE`
+* `NORMALIZED`
+* `NOT`
+* `NOTHING`
+* `NOWAIT`
+* `NULL`
+
+=== O
+
+* `OF`
+* `OFFSET`
+* `ON`
+* `ONLY`
+* `OPTION`
+* `OPTIONAL`
+* `OPTIONS`
+* `OR`
+* `ORDER`
+
+=== P
+
+* `PASSWORD`
+* `PASSWORDS`
+* `PATH`
+* `PATHS`
+* `PLAINTEXT`
+* `POINT`
+* `POPULATED`
+* `PRIMARIES`
+* `PRIMARY`
+* `PRIVILEGE`
+* `PRIVILEGES`
+* `PROCEDURE`
+* `PROCEDURES`
+* `PROPERTIES`
+* `PROPERTY`
+* `PROVIDER`
+* `PROVIDERS`
+
+=== R
+
+* `RANGE`
+* `READ`
+* `REALLOCATE`
+* `REDUCE`
+* `REL`
+* `RELATIONSHIP`
+* `RELATIONSHIPS`
+* `REMOVE`
+* `RENAME`
+* `REPEATABLE`
+* `REPLACE`
+* `REPORT`
+* `REQUIRE`
+* `REQUIRED`
+* `RESTRICT`
+* `RETURN`
+* `REVOKE`
+* `ROLE`
+* `ROLES`
+* `ROW`
+* `ROWS`
+
+=== S
+
+* `SCAN`
+* `SEC`
+* `SECOND`
+* `SECONDARIES`
+* `SECONDARY`
+* `SECONDS`
+* `SEEK`
+* `SERVER`
+* `SERVERS`
+* `SET`
+* `SETTING`
+* `SETTINGS`
+* `SHORTEST`
+* `SHORTEST_PATH`
+* `SHOW`
+* `SIGNED`
+* `SINGLE`
+* `SKIPROWS`
+* `START`
+* `STARTS`
+* `STATUS`
+* `STOP`
+* `STRING`
+* `SUPPORTED`
+* `SUSPENDED`
+
+=== T
+
+* `TARGET`
+* `TERMINATE`
+* `TEXT`
+* `THEN`
+* `TIME`
+* `TIMESTAMP`
+* `TIMEZONE`
+* `TO`
+* `TOPOLOGY`
+* `TRAILING`
+* `TRANSACTION`
+* `TRANSACTIONS`
+* `TRAVERSE`
+* `TRIM`
+* `TRUE`
+* `TYPE`
+* `TYPED`
+* `TYPES`
+
+=== U
+
+* `UNION`
+* `UNIQUE`
+* `UNIQUENESS`
+* `UNWIND`
+* `URL`
+* `USE`
+* `USER`
+* `USERS`
+* `USING`
+
+=== V, W, X, Y, Z
+
+* `VALUE`
+* `VARCHAR`
+* `VECTOR`
+* `VERTEX`
+
+//
+
+* `WAIT`
+* `WHEN`
+* `WHERE`
+* `WITH`
+* `WITHOUT`
+* `WRITE`
+
+//
+
+* `XOR`
+
+//
+
+* `YIELD`
+
+//
+
+* `ZONE`
+* `ZONED`
diff --git a/modules/ROOT/pages/syntax/reserved.adoc b/modules/ROOT/pages/syntax/reserved.adoc
deleted file mode 100644
index fe298c19b..000000000
--- a/modules/ROOT/pages/syntax/reserved.adoc
+++ /dev/null
@@ -1,117 +0,0 @@
-:description: This section contains a list of reserved keywords in Cypher.
-
-[[cypher-reserved]]
-= Reserved keywords
-
-
-This page contains a list of reserved keywords in Cypher.
-
-Reserved keywords are words that have a special meaning in Cypher.
-The listing of the reserved keywords are grouped by the categories from which they are drawn.
-In addition to this, there are a number of keywords that are reserved for future use.
-
-The reserved keywords are not permitted to be used as identifiers in the following contexts:
-
-* Variables
-* Function names
-* Parameters
-
-If any reserved keyword is quoted in backticks (```), such as `++`AND`++`, it would become a valid identifier in the above contexts; however, this approach is not recommended.
-
-== Clauses
-
-* `CALL`
-* `CREATE`
-* `DELETE`
-* `DETACH`
-* `FOREACH`
-* `LOAD`
-* `MATCH`
-* `MERGE`
-* `OPTIONAL`
-* `REMOVE`
-* `RETURN`
-* `SET`
-* `START`
-* `UNION`
-* `UNWIND`
-* `WITH`
-
-== Subclauses
-
-* `LIMIT`
-* `ORDER`
-* `SKIP`
-* `WHERE`
-* `YIELD`
-
-== Modifiers
-
-* `ASC`
-* `ASCENDING`
-* `ASSERT`
-* `BY`
-* `CSV`
-* `DESC`
-* `DESCENDING`
-* `ON`
-
-== Expressions
-
-* `ALL`
-* `CASE`
-* `COUNT`
-* `ELSE`
-* `END`
-* `EXISTS`
-* `THEN`
-* `WHEN`
-
-== Operators
-
-* `AND`
-* `AS`
-* `CONTAINS`
-* `DISTINCT`
-* `ENDS`
-* `IN`
-* `IS`
-* `NOT`
-* `OR`
-* `STARTS`
-* `XOR`
-
-== Schema
-
-* `CONSTRAINT`
-* `CREATE`
-* `DROP`
-* `EXISTS`
-* `INDEX`
-* `NODE`
-* `KEY`
-* `UNIQUE`
-
-== Hints
-
-* `INDEX`
-* `JOIN`
-* `SCAN`
-* `USING`
-
-== Literals
-
-* `false`
-* `null`
-* `true`
-
-== Reserved for future use
-
-* `ADD`
-* `DO`
-* `FOR`
-* `MANDATORY`
-* `OF`
-* `REQUIRE`
-* `SCALAR`
-
diff --git a/modules/ROOT/pages/syntax/variables.adoc b/modules/ROOT/pages/syntax/variables.adoc
index 2f4234691..9c4096199 100644
--- a/modules/ROOT/pages/syntax/variables.adoc
+++ b/modules/ROOT/pages/syntax/variables.adoc
@@ -24,7 +24,13 @@ Information regarding the naming of variables may be found xref::syntax/naming.a
 .Variables are only visible in the same query part
 ====
 Variables are not carried over to subsequent queries.
-If multiple query parts are chained together using `WITH`, variables have to be listed in the `WITH` clause to be carried over to the next part.
+If multiple query parts are chained together using `WITH`, variables defined in one part have to be listed in the `WITH` clause to be carried over to the next part.
 For more information see xref::clauses/with.adoc[WITH].
 ====
 
+[IMPORTANT]
+.Variables imported into a `CALL` subquery are visible in the whole subquery
+====
+Even if the subquery consists of multiple query parts chained together using `WITH`, variables imported from the outer query do not have to be listed in a `WITH` clause to be visible in subsequent parts of the subquery.
+For more information see xref::subqueries/call-subquery.adoc#variable-scope-clause[The variable scope clause].
+====