diff --git a/modules/elastic/api/metrics_util.go b/modules/elastic/api/metrics_util.go
index 672e7b3e..6f39a121 100644
--- a/modules/elastic/api/metrics_util.go
+++ b/modules/elastic/api/metrics_util.go
@@ -1052,7 +1052,6 @@ func (h *APIHandler) getSingleIndexMetrics(ctx context.Context, metricItems []*c
 	aggs := util.MapStr{}
 	metricItemsMap := map[string]*common.MetricLine{}
 	sumAggs := util.MapStr{}
-	var filterSubAggs = util.MapStr{}
 
 	for _, metricItem := range metricItems {
 		for _, line := range metricItem.Lines {
@@ -1065,23 +1064,7 @@ func (h *APIHandler) getSingleIndexMetrics(ctx context.Context, metricItems []*c
 				},
 			}
 			var sumBucketPath = "term_shard>"+ line.Metric.ID
-			if line.Metric.OnlyPrimary {
-				filterSubAggs[line.Metric.ID] = leafAgg
-				aggs["filter_pri"]=util.MapStr{
-					"filter": util.MapStr{
-						"term": util.MapStr{
-							"payload.elasticsearch.shard_stats.routing.primary": util.MapStr{
-								"value": true,
-							},
-						},
-					},
-					"aggs": filterSubAggs,
-				}
-				sumBucketPath = "term_shard>filter_pri>"+ line.Metric.ID
-			}else{
-				aggs[line.Metric.ID] = leafAgg
-			}
-
+			aggs[line.Metric.ID] = leafAgg
 			sumAggs[line.Metric.ID] = util.MapStr{
 				"sum_bucket": util.MapStr{
 					"buckets_path":  sumBucketPath,
@@ -1093,11 +1076,7 @@ func (h *APIHandler) getSingleIndexMetrics(ctx context.Context, metricItems []*c
 						"field": line.Metric.Field2,
 					},
 				}
-				if line.Metric.OnlyPrimary {
-					filterSubAggs[line.Metric.ID+"_field2"] = leafAgg2
-				}else{
-					aggs[line.Metric.ID+"_field2"] = leafAgg2
-				}
+				aggs[line.Metric.ID+"_field2"] = leafAgg2
 
 				sumAggs[line.Metric.ID + "_field2"] = util.MapStr{
 					"sum_bucket": util.MapStr{
@@ -1136,7 +1115,17 @@ func (h *APIHandler) getSingleIndexMetrics(ctx context.Context, metricItems []*c
 	clusterID := global.MustLookupString(elastic.GlobalSystemElasticsearchID)
 	intervalField, err := getDateHistogramIntervalField(clusterID, bucketSizeStr)
 	if err != nil {
-		panic(err)
+		return nil, err
+	}
+	if len(metricItems) > 0 && len(metricItems[0].Lines) > 0 && metricItems[0].Lines[0].Metric.OnlyPrimary {
+		query["query"] = util.MapStr{
+			"bool": util.MapStr{
+			"must": []util.MapStr{
+					query["query"].(util.MapStr),
+					{"term": util.MapStr{"payload.elasticsearch.shard_stats.routing.primary": true}},
+				},
+			},
+		}
 	}
 	query["size"] = 0
 	query["aggs"] = util.MapStr{