diff --git a/internal/client/elastic/elastic.go b/internal/client/elastic/elastic.go
index 98db07e..c3e6129 100644
--- a/internal/client/elastic/elastic.go
+++ b/internal/client/elastic/elastic.go
@@ -81,8 +81,6 @@ func (el *ElasticSearchClient) SearchDocuments(searchRequest string, fields []st
 		}
 	}
 
-	log.Printf("%s", aggregations)
-
 	return results, aggregations, res.Hits.Total.Value, nil
 }
 
diff --git a/pkg/jobs/jobScheduler.go b/pkg/jobs/jobScheduler.go
index d849bc2..33c1a19 100644
--- a/pkg/jobs/jobScheduler.go
+++ b/pkg/jobs/jobScheduler.go
@@ -47,7 +47,6 @@ func esCleanUpJob(s *JobScheduler) {
 	rangeQuery := utils.CreateRangeQueryForLteString("created_at", sevenDaysAgo)
 	search_query := utils.CreateSearchQuery(rangeQuery)
 	es_query := utils.CreateEsQuery(search_query)
-	println("final query %v", es_query)
 	s.elasticSearchClient.DeleteDocuments(es_query)
 
 }
diff --git a/service/ExceptionService.go b/service/ExceptionService.go
index 22267b7..cae78d9 100644
--- a/service/ExceptionService.go
+++ b/service/ExceptionService.go
@@ -13,9 +13,7 @@ import (
 	"cybertron/pkg/metrics"
 	"cybertron/pkg/utils"
 	"encoding/json"
-	"fmt"
 	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
 	"gorm.io/gorm"
 	"net/http"
 )
@@ -120,7 +118,7 @@ func (exceptionService *ExceptionService) CatchErrors(c *gin.Context) {
 
 	//ensure we are processing a valid payload
 	if len(lines) <= 2 {
-		exceptionService.logger.Error("payload is not valid", zap.Strings("payload", lines))
+		//exceptionService.logger.Error("payload is not valid", zap.Strings("payload", lines))
 		c.JSON(http.StatusOK, gin.H{"status": "payload is not valid"})
 		return
 	}
@@ -145,7 +143,7 @@ func (exceptionService *ExceptionService) CatchErrors(c *gin.Context) {
 		err := exceptionService.kafkaProducer.PublishEvent(errorItem, exceptionService.kafkaConfig.Topic, "", nil, encoder.JsonEncoderInstance)
 
 		if err != nil {
-			fmt.Println("Failed to push error to kafka")
+			exceptionService.logger.Error("Error publishing exception to Kafka: " + err.Error())
 		}
 	}
 
diff --git a/service/searchService.go b/service/searchService.go
index 91774a9..43ae457 100644
--- a/service/searchService.go
+++ b/service/searchService.go
@@ -74,11 +74,14 @@ func (s *SearchService) GetSearchResults(c *gin.Context) {
 	size_query := utils.CreateSizeQuery(int64(sizeInNumber))
 
 	term_query := utils.CreateTermSubQuery("project_id", projectId)
-	multiMatchQuery := utils.CreateMultiMatchQuery(search_key, "error", "title", "extra.metadata")
+	multiMatchQuery := utils.CreateMultiMatchQuery(search_key, "error", "title", "extra.metadata.agentId",
+		"extra.metadata.external_customer_id",
+		"extra.metadata.deviceId",
+		"extra.metadata.web_session_id", "extra.metadata.id")
 	should_query := utils.CreateMustQuery(term_query, multiMatchQuery)
 	boolQuery := utils.CreateBoolQuery(should_query)
 	search_query := utils.CreateSearchQuery(boolQuery)
-	source_query := utils.CreateSourceQuery("error")
+	source_query := utils.CreateSourceQuery("error", "error_hash", "created_at")
 	finalQuery := utils.CreateEsQuery(source_query, search_query, size_query)
 	fields := []string{"error", "significant_stack", "title"}
 	var res, _, total, err = s.elasticSearchClient.SearchDocuments(finalQuery, fields)