diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java
index c4d0835..3c28183 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/Change.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java
@@ -112,7 +112,8 @@ public class Change {
                 var entriesSize = api.getFormSize(qualifier, this.queryChange.getFormName());
                 System.out.println(entriesSize);
                 var changes = new ArrayList<ChangeItem>();
-                entries.forEach(entry -> {
+
+                for (var entry : entries) {
                         var change = new ChangeItem(entry.getEntryId());
                         change.setChangeNr(getValueStringByID(entry, "ChangeNr"));
                         change.setSupportGroup(getValueStringByID(entry, "SupportGroup"));
@@ -140,23 +141,20 @@ public class Change {
                                                         .map(Object::toString)
                                                         .filter(peopleFullName::equals)
                                                         .isPresent());
-                        try {
-                                var currentState = getValue(entry, "State").getIntValue();
-                                var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr"));
 
-                                var approve_reject = flagApproval(inApproval, currentState);
-                                change.setFlagApprove(approve_reject);
-                                change.setFlagReject(approve_reject);
-                                
-                                var cancel = flagCancel(getValueStringByID(entry, "SupportGroupId"), currentState);
-                                change.setFlagCancel(cancel);         
+                        var currentState = getValue(entry, "State").getIntValue();
+
+                        var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr"));
+                        var cancel = flagCancel(getValueStringByID(entry, "SupportGroupId"), currentState);
+                        var approve_reject = flagApproval(inApproval, currentState);
+
+                        change.setFlagApprove(approve_reject);
+                        change.setFlagReject(approve_reject);
+                        change.setFlagCancel(cancel);
+                        change.setFlagToApproval(flagToApproval(currentState));
 
-                                change.setFlagToApproval(flagToApproval(currentState));
-                        } catch (ARException e) {
-                                e.printStackTrace();
-                        }
                         changes.add(change);
-                });
+                }
 
                 api.freeImpersonatedUser();
                 return new ChangeResponse(entriesSize, changes);
@@ -168,8 +166,9 @@ public class Change {
 
                 var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"",
                                 queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
-          
-                var approvers = approversOI.isEmpty() ? null : approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
+
+                var approvers = approversOI.isEmpty() ? null
+                                : approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
                 return approvers != null ? approvers.contains(user) : false;
         }
 
@@ -179,9 +178,11 @@ public class Change {
         }
 
         public boolean flagCancel(String supportGroupId, int status) throws ARException {
-                var queryRoles = new Query.QueryBuilder("CTM:SupportGroupFuncRoleLookUp").addFieldId("Role", 1000000014).build();
-                var role = api.queryFieldsById("\'Support Group ID\' = \"" + supportGroupId + "\"", queryRoles.getFieldIds(), queryRoles.getFormName(), null, 0, 0)
-                        .get(0).get(queryRoles.getFieldId("Role")).toString();
+                var queryRoles = new Query.QueryBuilder("CTM:SupportGroupFuncRoleLookUp").addFieldId("Role", 1000000014)
+                                .build();
+                var role = api.queryFieldsById("\'Support Group ID\' = \"" + supportGroupId + "\"",
+                                queryRoles.getFieldIds(), queryRoles.getFormName(), null, 0, 0)
+                                .get(0).get(queryRoles.getFieldId("Role")).toString();
 
                 boolean approvableStatus = status == 1;
                 boolean isChangeManager = role.equals("Change Manager");