diff --git a/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp b/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
index f2cfba6..bfb0a2c 100644
--- a/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
+++ b/src/RESTAPI/RESTAPI_board_timepoint_handler.cpp
@@ -120,15 +120,10 @@ namespace OpenWifi {
 
         // sort by timestamp & serial number.
         struct {
-/*            bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
-                if(lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
-                if(lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
-                return lhs.timestamp < rhs.timestamp;
-*/
             bool operator()(const AnalyticsObjects::DeviceTimePoint &lhs, const AnalyticsObjects::DeviceTimePoint &rhs) const {
-                if(lhs.timestamp < rhs.timestamp) return true;
-                if(lhs.timestamp > rhs.timestamp) return false;
-                return lhs.device_info.serialNumber < rhs.device_info.serialNumber;
+                if (lhs.device_info.serialNumber < rhs.device_info.serialNumber) return true;
+                if (lhs.device_info.serialNumber > rhs.device_info.serialNumber) return false;
+                return lhs.timestamp < rhs.timestamp;
             }
         } DeviceTimePoint_sort;
 
@@ -142,8 +137,7 @@ namespace OpenWifi {
 
         struct {
             bool operator()(const AnalyticsObjects::UETimePoint &lhs, const AnalyticsObjects::UETimePoint &rhs) const {
-                if(lhs.station < rhs.station) return true;
-                return false;
+                return (lhs.station < rhs.station);
             }
         } Association_sort;
 
diff --git a/src/storage/storage_timepoints.cpp b/src/storage/storage_timepoints.cpp
index 5aa540a..0541914 100644
--- a/src/storage/storage_timepoints.cpp
+++ b/src/storage/storage_timepoints.cpp
@@ -71,7 +71,7 @@ namespace OpenWifi {
         } else if (LastDate) {
             WhereClause = fmt::format(" boardId='{}' and (timestamp <= {}) ", boardId, LastDate);
         }
-        GetRecords(0,MaxRecords,Recs,WhereClause," order by timestamp ASC ");
+        GetRecords(0,MaxRecords,Recs,WhereClause," order by timestamp, serialNumber ASC ");
         return true;
     }