diff --git a/docs/guides/quickfort-library-guide.rst b/docs/guides/quickfort-library-guide.rst
index acf5f7b60..e1c3e6b91 100644
--- a/docs/guides/quickfort-library-guide.rst
+++ b/docs/guides/quickfort-library-guide.rst
@@ -217,7 +217,7 @@ create a drainage system so your dwarves don't drown when digging the tap, by
 running the ``library/aquifer_tap.csv`` ``/help`` blueprint.
 
 You can see how to nullify the water pressure (so you don't flood your fort) in
-the `Dreamfort screenshot above <Services levels (4 deep)>`_.
+the Dreamfort cistern screenshot above: `Services levels (4 deep)`_.
 
 The blueprint spreadsheet is also available
 `online <https://docs.google.com/spreadsheets/d/1kwuCipF9FYAHNP9C_XlMpqVseaPu4SmL9YLUSQkbW4s/edit#gid=611877584>`__.
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp
index 09c3887cb..ee5eaa31c 100644
--- a/library/modules/Gui.cpp
+++ b/library/modules/Gui.cpp
@@ -343,6 +343,10 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
     if (game->main_interface.diplomacy.open) {
         newFocusString = baseFocus;
         newFocusString += "/Diplomacy";
+        if (game->main_interface.diplomacy.taking_requests)
+            newFocusString += "/Requests";
+        else
+            newFocusString += "/Default";
         focusStrings.push_back(newFocusString);
     }
     if (game->main_interface.petitions.open) {
diff --git a/scripts b/scripts
index fcccedb91..4c74bb905 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit fcccedb91e48ebdbe151950c86689d52f0617ea9
+Subproject commit 4c74bb9055c1c7a1bd49cbe535e2fc453cd79664