diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp
index 9249afc95..3cd230627 100644
--- a/include/engine/api/route_api.hpp
+++ b/include/engine/api/route_api.hpp
@@ -130,9 +130,9 @@ public:
                                        raw_route.target_traversed_in_reverse));
         }
 
+        response.add_waypoints(getWaypoints());
         auto routes_vector = fb_result.CreateVector(routes);
         response.add_routes(routes_vector);
-        response.add_waypoints(getWaypoints());
 
         return response;
     }
@@ -303,17 +303,11 @@ public:
 
         //Fill basix route info
         auto route = guidance::assembleRoute(legs);
-        auto weight_name_string = fb_result.CreateString(facade.GetWeightName());
-        routeObject.add_weight_name(weight_name_string);
         routeObject.add_distance(route.distance);
         routeObject.add_duration(route.duration);
         routeObject.add_weight(route.weight);
-
-        //Fill geometry
-        auto overview = MakeOverview(leg_geometries);
-        if(overview) {
-            MakeGeometry(routeObject, overview->begin(), overview->end());
-        }
+        auto weight_name_string = fb_result.CreateString(facade.GetWeightName());
+        routeObject.add_weight_name(weight_name_string);
 
         //Fill legs
         std::vector<flatbuffers::Offset<fbresult::Leg>> routeLegs;
@@ -548,6 +542,12 @@ public:
         auto legs_vector = fb_result.CreateVector(routeLegs);
         routeObject.add_legs(legs_vector);
 
+        //Fill geometry
+        auto overview = MakeOverview(leg_geometries);
+        if(overview) {
+            MakeGeometry(routeObject, overview->begin(), overview->end());
+        }
+
         return routeObject.Finish();
     }
 
diff --git a/include/engine/api/table_api.hpp b/include/engine/api/table_api.hpp
index f81750a98..3efa2afe3 100644
--- a/include/engine/api/table_api.hpp
+++ b/include/engine/api/table_api.hpp
@@ -95,8 +95,6 @@ class TableAPI final : public BaseAPI
             table.add_destinations(MakeWaypoints(fb_result, phantoms, parameters.destinations));
         }
 
-        table.add_rows(number_of_sources);
-        table.add_cols(number_of_destinations);
         if (parameters.annotations & TableParameters::AnnotationsType::Duration)
         {
             table.add_durations(MakeDurationTable(fb_result, tables.first));
@@ -111,6 +109,10 @@ class TableAPI final : public BaseAPI
         {
             table.add_fallback_speed_cells(MakeEstimatesTable(fb_result, fallback_speed_cells));
         }
+
+        table.add_rows(number_of_sources);
+        table.add_cols(number_of_destinations);
+
         response.add_table(table.Finish());
         fb_result.Finish(response.Finish());
     }