diff --git a/docs/sources/features/explore/index.md b/docs/sources/features/explore/index.md
index 7cc14dd8a9b..c1fd03d8d35 100755
--- a/docs/sources/features/explore/index.md
+++ b/docs/sources/features/explore/index.md
@@ -84,7 +84,7 @@ By default, query history shows you the most recent queries. You can sort your h
 
 Filter query history in Query history and Starred tab by data source name:
 
-1. Click the **Filter queries for specific data source(s)** field
+1. Click the **Filter queries for specific data source(s)** field.
 2. Select the data source for which you would like to filter your history. You can select multiple data sources.
 
 In **Query history** tab it is also possible to filter queries by date using the slider:
@@ -95,6 +95,13 @@ In **Query history** tab it is also possible to filter queries by date using the
 
 > Note: If you are in split mode, filters are applied only to your currently active panel.
 
+### Search in query history
+
+You can search in your history across queries and your comments. Search is possible for queries in the Query history tab and Starred tab.
+
+1. Click the **Search queries** field.
+1. Type the term you are searching for into search field.
+
 ### Query history settings
 
 You can customize the query history in the Settings tab. Options are described in the table below.
@@ -103,7 +110,7 @@ You can customize the query history in the Settings tab. Options are described i
 | ------------------------------------------------------------- | --------------------------------------- |
 | Period of time for which Grafana will save your query history | 1 week                                  |
 | Change the default active tab                                 | Query history tab                       |
-| Only show queries for datasource currently active in Explore  | False                                   |
+| Only show queries for data source currently active in Explore  | True                                    |
 | Clear query history                                           | Permanently deletes all stored queries. |
 
 > Note: Query history settings are global, and applied to both panels in split mode.
@@ -199,6 +206,7 @@ While in Live tail view new logs will come from the bottom of the screen and wil
 {{< docs-imagebox img="/img/docs/v64/explore_live_tailing.gif" class="docs-image--no-shadow" caption="Explore Live tailing in action" >}}
 
 ## Tracing integration
+
 > Only available in Grafana v7.0+.
 
 You can visualize traces from tracing data sources in explore. Data sources currently supported:
@@ -229,12 +237,13 @@ Shows condensed view or the trace timeline. Drag your mouse over the minimap to
 {{< docs-imagebox img="/img/docs/v70/explore-trace-view-timeline.png" class="docs-image--no-shadow" caption="Screenshot of the trace view timeline" >}}
 
 Shows list of spans within the trace. Each span row consists of these components:
+
 - Expand children button: Expands or collapses all the children spans of selected span.
 - Service name: Name of the service logged the span.
 - Operation name: Name of the operation that this span represents.
 - Span duration bar: Visual representation of the operation duration within the trace.
 
-Clicking anywhere on the span row will show span details. 
+Clicking anywhere on the span row shows span details.
 
 ##### Span details