diff --git a/api_docs/construct-narrow.md b/api_docs/construct-narrow.md
index c0c916ff0b..8b00d1479d 100644
--- a/api_docs/construct-narrow.md
+++ b/api_docs/construct-narrow.md
@@ -42,7 +42,7 @@ Zulip API.
 
 Note that many narrows, including all that lack a `channel` or `channels`
 operator, search the current user's personal message history. See
-[searching shared history](/help/search-for-messages#searching-shared-history)
+[searching shared history](/help/search-for-messages#search-shared-history)
 for details.
 
 Clients should note that the `is:unread` filter takes advantage of the
diff --git a/help/search-for-messages.md b/help/search-for-messages.md
index 3a1125f99e..5bc7c69d97 100644
--- a/help/search-for-messages.md
+++ b/help/search-for-messages.md
@@ -84,10 +84,18 @@ Zulip offers the following filters based on the location of the message.
   between you, Bo, and Elena.
 * `dm-including:Bo Lin`: Search all direct message conversations
   (1-on-1 and group) that include you and Bo, as well as any other users.
-* `channels:public`: Search the history of all [public
-  channels](/help/change-the-privacy-of-a-channel) in the organization, including
-  channels you are not subscribed to; see details
-  [below](#searching-shared-history).
+
+### Search shared history
+
+To avoid cluttering your search results, by default, Zulip searches just the
+messages you received. You can use `channels:` or `channel:` filters to search
+additional messages.
+
+* `channels:public`: Search messages in all
+  [public](/help/channel-permissions#public-channels) and
+  [web-public](/help/channel-permissions#web-public-channels) channels.
+* `channel:design`: Search all messages in **#design**, including messages sent
+  before you were a subscriber.
 
 ### Search by sender
 
@@ -152,29 +160,6 @@ the specified rule. For example:
   topics](/help/resolve-a-topic) in the **#design** channel that don't contain
   images.
 
-## Searching shared history
-
-Zulip's [channel permissions](/help/channel-permissions) model allows access to
-the full history of public channels and private channels with shared history,
-including messages sent before you joined the channel (or organization), or those
-sent to public channels you are not subscribed to.
-
-By default, Zulip searches messages in your history, i.e., the
-messages you actually received.  This avoids cluttering search results
-with irrelevant messages from public channels you're not interested in.
-
-If you'd like to instead search the organization's shared history, any query
-using the `channel:` or `channels:` filters will search all messages that you have
-access to in the selected channel(s).  For example:
-
-* `channels:public logo`: Search for `logo` in all public channels in the
-  organization.
-* `channels:public sender:Elena García`: Search for all messages sent by
-  Elena to any public channel.
-* `channel:design logo`: Search for the word `logo` in all messages sent to
-  **#design**, regardless of whether you were subscribed at the time the message
-  was sent.
-
 ## Linking to search results
 
 When you search Zulip, the URL shown in the address bar of the Zulip web app is a
diff --git a/web/templates/message_feed_errors.hbs b/web/templates/message_feed_errors.hbs
index 910ce1c9ee..e8c9e47e73 100644
--- a/web/templates/message_feed_errors.hbs
+++ b/web/templates/message_feed_errors.hbs
@@ -15,7 +15,7 @@
         {{#tr}}
         End of results from your
         <z-link>history</z-link>.
-        {{#*inline "z-link"}}<a href="/help/search-for-messages#searching-shared-history"
+        {{#*inline "z-link"}}<a href="/help/search-for-messages#search-shared-history"
           target="_blank" rel="noopener noreferrer">{{> @partial-block}}</a>{{/inline}}
         {{/tr}}
         &nbsp;
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index dcc98612b3..53e08b6658 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -8039,7 +8039,7 @@ paths:
             Note that many narrows, including all that lack a `channel`, `channels`,
             `stream`, or `streams` operator, search the user's personal message
             history. See [searching shared
-            history](/help/search-for-messages#searching-shared-history)
+            history](/help/search-for-messages#search-shared-history)
             for details.
 
             For example, if you would like to fetch messages from all public channels instead