diff --git a/_query-dsl/geo-and-xy/geoshape.md b/_query-dsl/geo-and-xy/geoshape.md
index 42948666f4f..8acc691c3aa 100644
--- a/_query-dsl/geo-and-xy/geoshape.md
+++ b/_query-dsl/geo-and-xy/geoshape.md
@@ -25,15 +25,15 @@ Relation | Description | Supporting geographic field type
 
 ## Defining the shape in a geoshape query
 
-You can define the shape to filter documents in a geoshape query either by providing a new shape definition at query time or by referencing the name of a shape pre-indexed in another index.  
+You can define the shape to filter documents in a geoshape query either by [providing a new shape definition at query time](#using-a-new-shape-definition) or by [referencing the name of a shape pre-indexed in another index](#using-a-pre-indexed-shape-definition).  
 
-### Using a new shape definition
+## Using a new shape definition
 
 To provide a new shape to a geoshape query, define it in the `geo_shape` field. You must define the geoshape in [GeoJSON format](https://geojson.org/). 
 
 The following example illustrates searching for documents containing geoshapes that match a geoshape defined at query time.
 
-#### Step 1: Create an index
+### Step 1: Create an index
 
 First, create an index and map the `location` field as a `geo_shape`:
 
@@ -422,7 +422,7 @@ GET /testindex/_search
 Geoshape queries whose geometry collection contains a linestring or a multilinestring do not support the `WITHIN` relation.
 {: .note}
 
-### Using a pre-indexed shape definition
+## Using a pre-indexed shape definition
 
 When constructing a geoshape query, you can also reference the name of a shape pre-indexed in another index. Using this method, you can define a geoshape at index time and refer to it by name at search time.