diff --git a/docs/code-navigation/index.mdx b/docs/code-navigation/index.mdx
index 56963f786..7c79ac16a 100644
--- a/docs/code-navigation/index.mdx
+++ b/docs/code-navigation/index.mdx
@@ -79,6 +79,10 @@ Code Navigation helps you with the following tasks:
 	→](/code-navigation/features)
 </Callout>
 
+## Smart hover summaries
+
+When [precise code navigation](/code-navigation/precise-code-navigation) data is available, the hover adds a generated summary of the symbol's meaning and its usage across your codebase. See [Smart hover summaries](/code-navigation/smart-hover).
+
 ## Code Navigation types
 
 There are two types of Code Navigation that Sourcegraph supports:
diff --git a/docs/code-search/features.mdx b/docs/code-search/features.mdx
index cbd571f25..9c380dd42 100644
--- a/docs/code-search/features.mdx
+++ b/docs/code-search/features.mdx
@@ -61,6 +61,14 @@ Every search on Sourcegraph uses a search context. Search contexts can be define
 
 See the [search contexts](/code-search/working/search-contexts) documentation to learn how to use and create search contexts.
 
+### Query-based search contexts
+
+A search context can be defined by a search query instead of a fixed list of repositories and revisions. See [query-based search contexts](/code-search/working/search-contexts#query-based-search-contexts).
+
+## Search jobs
+
+Search jobs run a query in the background without the timeouts and result limits of interactive searches, and let you download the results when they finish. See [Search Jobs](/code-search/types/search-jobs).
+
 ## Multi-branch indexing
 
 The most common branch to search is your default branch. To speed up this common operation, Sourcegraph maintains an index of the source code on your default branch. Some organizations have other branches that are regularly searched. To speed up search for those branches, Sourcegraph can be configured to index up to 64 branches per repository. Your administrator can configure multi-branch indexing through [advanced configuration](/admin/search#multi-branch-indexing).
diff --git a/docs/code-search/queries/index.mdx b/docs/code-search/queries/index.mdx
index 5d8ad434d..9f3f653c0 100644
--- a/docs/code-search/queries/index.mdx
+++ b/docs/code-search/queries/index.mdx
@@ -59,7 +59,15 @@ Clicking the (.\*) toggle interprets all search patterns as regular expressions.
 	case-insensitive by default (toggle the `Aa` button to change).
 </Callout>
 
-## Filters (all searches)
+### Structural search
+
+Structural search matches code by its syntactic structure instead of its text. It is disabled by default; see [Structural search](/code-search/types/structural).
+
+## Filters
+
+Filters scope a search to certain repositories, files, languages, and more. Some filters apply to all searches, and others only to [diff and commit searches](#diff-and-commit-searches).
+
+### Filters (all searches)
 
 The following filters can be used on all searches (using [RE2 syntax](https://golang.org/s/re2syntax) any place a regex is accepted):
 
@@ -148,7 +156,11 @@ To apply the scope of the `file` filter to the entire subexpression, fully group
 	use cases.
 </Callout>
 
-## Filters (diff and commit searches only)
+## Diff and commit searches
+
+`type:diff` searches commit diffs and `type:commit` searches commit messages. For the date formats that `before:` and `after:` accept, see the [language reference](/code-search/queries/language#before).
+
+### Filters (diff and commit searches only)
 
 The following filters are only used for **commit diff** and **commit message** searches, which show changes over time:
 
@@ -226,3 +238,7 @@ A query with `type:path` restricts terms to matching filenames only (not file co
 A query with `type:file` restricts terms to matching file contents only (not filenames).
 
 - Example: [`type:file repo:^github\.com/sourcegraph/about$ website`](https://sourcegraph.com/search?q=type:file+repo:%5Egithub%5C.com/sourcegraph/about%24+website&patternType=keyword)
+
+## Result types and select
+
+Use `select:` to show only one type of result, for example `select:repo` for distinct repositories or `select:commit.diff.added` for added code. See the [`select` reference](/code-search/queries/language#select) for every result type.
diff --git a/src/data/redirects.ts b/src/data/redirects.ts
index e6cfbc2e2..f26b5e27c 100644
--- a/src/data/redirects.ts
+++ b/src/data/redirects.ts
@@ -4385,6 +4385,12 @@ const redirectsData = [
 		source: '/dotcom/indexing_open_source_code',
 		destination: '/'
 	},
+	// Product and generated links use the path from the docs rewrite in
+	// sourcegraph/sourcegraph; keeps them working until that site replaces this one
+	{
+		source: '/self-hosted/deploy/search-performance',
+		destination: '/admin/search'
+	},
 ];
 
 const updatedRedirectsData = redirectsData.map(redirect => {