diff --git a/.gitignore b/.gitignore
index 1d7fbd2..bb733b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Database
 /DB/
+/Database/
 
 # Database logs
 *.log
diff --git a/src/main/java/com/application/fxgraph/graph/EventHandlers.java b/src/main/java/com/application/fxgraph/graph/EventHandlers.java
index 45d0370..d376bd6 100644
--- a/src/main/java/com/application/fxgraph/graph/EventHandlers.java
+++ b/src/main/java/com/application/fxgraph/graph/EventHandlers.java
@@ -314,7 +314,7 @@ public void handle(MouseEvent event) {
                     String finalPackageName = packageName;
                     String finalMethodName = methodName;
                     eleIdList.stream().forEach(eId -> {
-                        String query = "SELECT E.ID AS EID, bound_box_x_coordinate, bound_box_y_coordinate, THREAD_ID " +
+                        String query = "SELECT E.ID AS EID, bound_box_x_coordinate, bound_box_y_coordinate, THREAD_ID, collapsed " +
                                 "FROM CALL_TRACE AS CT " +
                                 "JOIN ELEMENT AS E ON CT.ID = E.ID_ENTER_CALL_TRACE " +
                                 "WHERE E.ID = " + eId;
@@ -325,7 +325,7 @@ public void handle(MouseEvent event) {
                                 String targetThreadId = String.valueOf(elementRS.getInt("thread_id"));
                                 float xCoordinate = elementRS.getFloat("bound_box_x_coordinate");
                                 float yCoordinate = elementRS.getFloat("bound_box_y_coordinate");
-
+                                int targetCellCollapsed = elementRS.getInt("collapsed");
                                 double width = graph.getScrollPane().getContent().getBoundsInLocal().getWidth();
                                 double height = graph.getScrollPane().getContent().getBoundsInLocal().getHeight();
 
@@ -333,7 +333,7 @@ public void handle(MouseEvent event) {
                                 Button jumpToButton = new Button();
                                 jumpToButton.setOnMouseClicked(event1 -> {
                                     System.out.println("EventHandlers.handle: jumpToButton Clicked. for eleId: " + eId);
-                                    jumpTo(eId, targetThreadId, collapsed);
+                                    jumpTo(eId, targetThreadId, targetCellCollapsed);
                                 });
                                 buttonList.add(jumpToButton);
                             }