diff --git a/service/incident_service.go b/service/incident_service.go
index 7b3b3d5..31edff3 100644
--- a/service/incident_service.go
+++ b/service/incident_service.go
@@ -158,20 +158,23 @@ func (i *incidentService) GetIncidentResponseFromIncidentEntity(
     var incidentResponses []service.IncidentResponse = []service.IncidentResponse{}    
     for incidentIndex := range incidents {     
         incidentResponses = append(incidentResponses, service.ConvertToIncidentResponse(incidents[incidentIndex]))
-        team := funk.Find(teams, func(team *team.TeamEntity) bool {
-            return team.ID == incidents[incidentIndex].TeamId
-        }).(team.TeamEntity)  
-        incidentResponses[incidentIndex].TeamName = team.Name
+        for _, t := range *teams {
+            if t.ID == incidents[incidentIndex].TeamId {
+                incidentResponses[incidentIndex].TeamName = t.Name
+            }
+        }        
+        
+        for _, s := range *severities {
+            if s.ID == incidents[incidentIndex].SeverityId {
+                incidentResponses[incidentIndex].SeverityName = s.Name
+            }
+        }    
 
-        severity := funk.Find(severities, func(severity *severity.SeverityEntity) bool {
-            return severity.ID == incidents[incidentIndex].SeverityId
-        }).(severity.SeverityEntity)  
-        incidentResponses[incidentIndex].SeverityName = severity.Name
-
-        incidentStatus := funk.Find(incidentStatuses, func(incidentStatus *incident.IncidentStatusEntity) bool {
-            return incidentStatus.ID == incidents[incidentIndex].Status
-        }).(incident.IncidentStatusEntity)
-        incidentResponses[incidentIndex].StatusName = incidentStatus.Name            
+        for _, is := range *incidentStatuses {
+            if is.ID == incidents[incidentIndex].Status {
+                incidentResponses[incidentIndex].StatusName = is.Name
+            }
+        }  
         incidentResponses[incidentIndex].CreatedBy = userEmailMappings[incidents[incidentIndex].CreatedBy]
         incidentResponses[incidentIndex].UpdatedBy = userEmailMappings[incidents[incidentIndex].UpdatedBy]
     }