diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index 7c3d080..d61cccd 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/src/main/java/seng202/group9/Controller/App.java
@@ -93,6 +93,13 @@ public class App extends Application
 		} catch (Exception e){
 			e.printStackTrace();
 		}
+		if (session.getCurrentDataset() != null){
+			for (int i = 0; i < datasets.size(); i ++) {
+				if (datasets.get(i).getName().equals(session.getCurrentDataset())) {
+					currentDataset = datasets.get(i);
+				}
+			}
+		}
 		//after all loading then load the previous session
 		if (session.getSceneDisplayed() != null) {
 			menuController.replaceSceneContent(session.getSceneDisplayed());
diff --git a/src/main/java/seng202/group9/GUI/AirlineSummaryController.java b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java
index d720dbf..db07fb8 100644
--- a/src/main/java/seng202/group9/GUI/AirlineSummaryController.java
+++ b/src/main/java/seng202/group9/GUI/AirlineSummaryController.java
@@ -63,7 +63,7 @@ public class AirlineSummaryController extends Controller{
         map = new Map(mapView, new RoutePath());
         tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Airline>() {
             public void changed(ObservableValue<? extends Airline> observable, Airline oldValue, Airline newValue) {
-                Airline selectedAirline= currentData.getAirlines().get(tableView.getSelectionModel().getSelectedIndices().get(0));
+                Airline selectedAirline= tableView.getSelectionModel().getSelectedItems().get(0);
                 for (int i = 0 ; i < currentData.getAirports().size(); i ++){
                     if (currentData.getAirports().get(i).getCountryName().equals(selectedAirline.getCountryName())){
                         map.displayAirport(new RoutePath(new Position(currentData.getAirports().get(i).getLatitude(), currentData.getAirports().get(i).getLongitude())));
diff --git a/src/main/java/seng202/group9/GUI/AirportSummaryController.java b/src/main/java/seng202/group9/GUI/AirportSummaryController.java
index 1b2f0dd..7435d9c 100644
--- a/src/main/java/seng202/group9/GUI/AirportSummaryController.java
+++ b/src/main/java/seng202/group9/GUI/AirportSummaryController.java
@@ -86,7 +86,7 @@ public class AirportSummaryController extends Controller{
         tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Airport>() {
             public void changed(ObservableValue<? extends Airport> observable, Airport oldValue, Airport newValue) {
                 System.out.println("loading");
-                Airport selectedAirport= currentData.getAirports().get(tableView.getSelectionModel().getSelectedIndices().get(0));
+                Airport selectedAirport= tableView.getSelectionModel().getSelectedItems().get(0);
                 map.displayAirport(new RoutePath( new Position(selectedAirport.getLatitude(), selectedAirport.getLongitude())));
             }
         });
diff --git a/src/main/java/seng202/group9/GUI/RouteSummaryController.java b/src/main/java/seng202/group9/GUI/RouteSummaryController.java
index 60d8bc2..92e7aef 100644
--- a/src/main/java/seng202/group9/GUI/RouteSummaryController.java
+++ b/src/main/java/seng202/group9/GUI/RouteSummaryController.java
@@ -57,7 +57,7 @@ public class RouteSummaryController extends Controller{
         tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Route>() {
             public void changed(ObservableValue<? extends Route> observable, Route oldValue, Route newValue) {
                 System.out.println("loading");
-                Route selectedRoute= currentData.getRoutes().get(tableView.getSelectionModel().getSelectedIndices().get(0));
+                Route selectedRoute= tableView.getSelectionModel().getSelectedItems().get(0);
                 if (selectedRoute.getSourceAirport() != null && selectedRoute.getDestinationAirport() != null) {
                     map.displayRoute(new RoutePath(
                             new Position(selectedRoute.getSourceAirport().getLatitude(), selectedRoute.getSourceAirport().getLongitude()),