diff --git a/docs/en/docs/advanced/advanced-dependencies.md b/docs/en/docs/advanced/advanced-dependencies.md
index 5d6a40f46..37f5c78f2 100644
--- a/docs/en/docs/advanced/advanced-dependencies.md
+++ b/docs/en/docs/advanced/advanced-dependencies.md
@@ -144,7 +144,7 @@ This was changed in version 0.110.0 to fix unhandled memory consumption from for
 
 ### Background Tasks and Dependencies with `yield`, Technical Details { #background-tasks-and-dependencies-with-yield-technical-details }
 
-Before FastAPI 0.106.0, raising exceptions after `yield` was not possible, the exit code in dependencies with `yield` was executed *after* the response was sent, so [Exception Handlers](../handling-errors.md#install-custom-exception-handlers){.internal-link target=_blank} would have already run.
+Before FastAPI 0.106.0, raising exceptions after `yield` was not possible, the exit code in dependencies with `yield` was executed *after* the response was sent, so [Exception Handlers](../tutorial/handling-errors.md#install-custom-exception-handlers){.internal-link target=_blank} would have already run.
 
 This was designed this way mainly to allow using the same objects "yielded" by dependencies inside of background tasks, because the exit code would be executed after the background tasks were finished.
 
diff --git a/docs/en/mkdocs.yml b/docs/en/mkdocs.yml
index 323035240..deb0997de 100644
--- a/docs/en/mkdocs.yml
+++ b/docs/en/mkdocs.yml
@@ -108,32 +108,38 @@ nav:
   - Tutorial - User Guide:
     - tutorial/index.md
     - tutorial/first-steps.md
-    - tutorial/path-params.md
-    - tutorial/query-params.md
-    - tutorial/body.md
-    - tutorial/query-params-str-validations.md
-    - tutorial/path-params-numeric-validations.md
-    - tutorial/query-param-models.md
-    - tutorial/body-multiple-params.md
-    - tutorial/body-fields.md
-    - tutorial/body-nested-models.md
+    - Path:
+      - tutorial/path-params.md
+      - tutorial/path-params-numeric-validations.md
+      - tutorial/path-operation-configuration.md
+    - Query:
+      - tutorial/query-params.md
+      - tutorial/query-params-str-validations.md
+      - tutorial/query-param-models.md
+    - Body:
+      - tutorial/body.md
+      - tutorial/body-multiple-params.md
+      - tutorial/body-fields.md
+      - tutorial/body-nested-models.md
+      - tutorial/body-updates.md
+    - Cookie:
+      - tutorial/cookie-params.md
+      - tutorial/cookie-param-models.md
+    - Header:
+      - tutorial/header-params.md
+      - tutorial/header-param-models.md
+    - Form and File:
+      - tutorial/request-forms.md
+      - tutorial/request-form-models.md
+      - tutorial/request-files.md
+      - tutorial/request-forms-and-files.md
     - tutorial/schema-extra-example.md
     - tutorial/extra-data-types.md
-    - tutorial/cookie-params.md
-    - tutorial/header-params.md
-    - tutorial/cookie-param-models.md
-    - tutorial/header-param-models.md
     - tutorial/response-model.md
     - tutorial/extra-models.md
     - tutorial/response-status-code.md
-    - tutorial/request-forms.md
-    - tutorial/request-form-models.md
-    - tutorial/request-files.md
-    - tutorial/request-forms-and-files.md
     - tutorial/handling-errors.md
-    - tutorial/path-operation-configuration.md
     - tutorial/encoder.md
-    - tutorial/body-updates.md
     - Dependencies:
       - tutorial/dependencies/index.md
       - tutorial/dependencies/classes-as-dependencies.md
diff --git a/scripts/docs.py b/scripts/docs.py
index 56ffb9d36..558f08759 100644
--- a/scripts/docs.py
+++ b/scripts/docs.py
@@ -297,7 +297,7 @@ def live(
     if dirty:
         args.append("--dirty")
     subprocess.run(
-        args, env={**os.environ, "LINENUMS": "true"}, cwd=lang_path, check=True
+        args, env={**os.environ, "LINENUMS": "true", "PYTHONUTF8": "1"}, cwd=lang_path, check=True
     )