diff --git a/modules/ROOT/content-nav.adoc b/modules/ROOT/content-nav.adoc
index 6b1add734..b82e15537 100644
--- a/modules/ROOT/content-nav.adoc
+++ b/modules/ROOT/content-nav.adoc
@@ -119,3 +119,6 @@
 * Appendix
 ** xref:styleguide.adoc[]
 ** xref:appendix/tutorials/index.adoc[]
+*** xref:appendix/tutorials/basic-query-tuning.adoc[]
+*** xref:appendix/tutorials/advanced-query-tuning.adoc[]
+*** xref:appendix/tutorials/shortestpath-planning.adoc[]
diff --git a/modules/ROOT/pages/clauses/order-by.adoc b/modules/ROOT/pages/clauses/order-by.adoc
index af3afcc60..d71bd51e8 100644
--- a/modules/ROOT/pages/clauses/order-by.adoc
+++ b/modules/ROOT/pages/clauses/order-by.adoc
@@ -240,4 +240,4 @@ This rule is to make sure that `ORDER BY` does not change the results, only the
 
 The performance of Cypher queries using `ORDER BY` on node properties can be influenced by the existence and use of an index for finding the nodes.
 If the index can provide the nodes in the order requested in the query, Cypher can avoid the use of an expensive `Sort` operation.
-Read more about this capability in xref::appendix/tutorials/advanced-query-tuning.adoc#advanced-query-tuning-example-index-backed-order-by[Index-backed ORDER BY].
+Read more about this capability in xref::indexes/search-performance-indexes/using-indexes.adoc#range-index-backed-order-by[Range index-backed ORDER BY].
diff --git a/modules/ROOT/pages/clauses/use.adoc b/modules/ROOT/pages/clauses/use.adoc
index 9cff87f1e..54dacfba5 100644
--- a/modules/ROOT/pages/clauses/use.adoc
+++ b/modules/ROOT/pages/clauses/use.adoc
@@ -27,7 +27,7 @@ Where `<graph>` refers to the name or alias of a database in the DBMS.
 [[query-use-syntax-composite]]
 === Composite database syntax
 
-When running queries against a link:{neo4j-docs-base-uri}/operations-manual/{page-version}/composite-databases[composite database], the `USE` clause can also appear as the first clause of:
+When running queries against a link:{neo4j-docs-base-uri}/operations-manual/{page-version}/database-administration/composite-databases/concepts/[composite database], the `USE` clause can also appear as the first clause of:
 
 * Union parts:
 +
diff --git a/modules/ROOT/pages/patterns/concepts.adoc b/modules/ROOT/pages/patterns/concepts.adoc
index 24ea0a0e2..3715e8894 100644
--- a/modules/ROOT/pages/patterns/concepts.adoc
+++ b/modules/ROOT/pages/patterns/concepts.adoc
@@ -836,7 +836,6 @@ RETURN [n in nodes(p) | n.name] AS stops
 |===
 
 On a large, highly connected graph, this can be very time consuming.
-See the section on xref::appendix/tutorials/shortestpath-planning.adoc[shortest path planning] for more information.
 
 [[shortest-path-all-shortest-paths]]
 === All shortest paths