diff --git a/Controllers/RouteController.cs b/Controllers/RouteController.cs
index 392fed0..967de19 100644
--- a/Controllers/RouteController.cs
+++ b/Controllers/RouteController.cs
@@ -127,7 +127,7 @@ namespace EFB.Controllers
                     Dictionary<string, string> headerData = new Dictionary<string, string>();
                     headerData.Add("Authorization", $"Bearer {user.UserToken.TokenValue}");
 
-                    while (collected == false && pollCount < 3)
+                    while (collected == false && pollCount < 15)
                     {
                         //Make Polling Request
                         var pollingRequest = API.Put<List<PollResponse>>($"https://api.autorouter.aero/v1.0/router/{user.RouteToken.TokenValue}/longpoll", headerData, null);
diff --git a/Models/RouteModel.cs b/Models/RouteModel.cs
index 9d4e41e..49795a9 100644
--- a/Models/RouteModel.cs
+++ b/Models/RouteModel.cs
@@ -88,7 +88,7 @@ namespace EFB.Models
             route.Current.Next = route.Arrival;
             route.Arrival.Previous = route.Current;
 
-            route.Current = null;
+            route.Current = route.Departure;
 
             return route;
         }
diff --git a/Sessions/SessionExtensions.cs b/Sessions/SessionExtensions.cs
index 5b1577a..e433f17 100644
--- a/Sessions/SessionExtensions.cs
+++ b/Sessions/SessionExtensions.cs
@@ -7,7 +7,11 @@ namespace EFB.Sessions
     {
         public static void SetObject(this ISession session, string key, object value)
         {//Sets the object of a session to Object
-            session.SetString(key, JsonConvert.SerializeObject(value));
+            session.SetString(key, JsonConvert.SerializeObject(value, Formatting.None, 
+                new JsonSerializerSettings(){
+                    ReferenceLoopHandling = ReferenceLoopHandling.Ignore
+                }
+            ));
         }
 
         public static T GetObject<T>(this ISession session, string key)