diff --git a/magnetar_sdk/src/types/mod.rs b/magnetar_sdk/src/types/mod.rs
index 4b3442b..4e90611 100644
--- a/magnetar_sdk/src/types/mod.rs
+++ b/magnetar_sdk/src/types/mod.rs
@@ -15,7 +15,7 @@ use serde::{Deserialize, Deserializer, Serialize};
 use ts_rs::TS;
 
 pub(crate) mod packed_time {
-    use chrono::{DateTime, NaiveDateTime, Utc};
+    use chrono::{DateTime, Utc};
     use serde::de::Error;
     use serde::{Deserialize, Deserializer, Serializer};
 
@@ -30,15 +30,12 @@ pub(crate) mod packed_time {
     where
         D: Deserializer<'de>,
     {
-        Ok(DateTime::<Utc>::from_naive_utc_and_offset(
-            NaiveDateTime::from_timestamp_millis(
-                String::deserialize(deserializer)?
-                    .parse::<i64>()
-                    .map_err(Error::custom)?,
-            )
-            .ok_or_else(|| Error::custom("millisecond value out of range"))?,
-            Utc,
-        ))
+        DateTime::<Utc>::from_timestamp_millis(
+            String::deserialize(deserializer)?
+                .parse::<i64>()
+                .map_err(Error::custom)?,
+        )
+            .ok_or_else(|| Error::custom("millisecond value out of range"))
     }
 }
 
@@ -91,14 +88,14 @@ impl SpanFilter {
     pub fn start(&self) -> Option<(DateTime<Utc>, String)> {
         match self {
             Self::Start(StartFilter {
-                time_start,
-                id_start,
-            })
+                            time_start,
+                            id_start,
+                        })
             | Self::Range(RangeFilter {
-                time_start,
-                id_start,
-                ..
-            }) => Some((*time_start, id_start.clone())),
+                              time_start,
+                              id_start,
+                              ..
+                          }) => Some((*time_start, id_start.clone())),
             _ => None,
         }
     }
@@ -107,8 +104,8 @@ impl SpanFilter {
         match self {
             Self::End(EndFilter { time_end, id_end })
             | Self::Range(RangeFilter {
-                time_end, id_end, ..
-            }) => Some((*time_end, id_end.clone())),
+                              time_end, id_end, ..
+                          }) => Some((*time_end, id_end.clone())),
             _ => None,
         }
     }
@@ -145,10 +142,10 @@ impl SpanFilter {
             })),
             Self::Range(RangeFilter { time_start, .. }) if *time_start > last_date => None,
             Self::Range(RangeFilter {
-                time_start,
-                id_start,
-                ..
-            }) => Some(SpanFilter::Range(RangeFilter {
+                            time_start,
+                            id_start,
+                            ..
+                        }) => Some(SpanFilter::Range(RangeFilter {
                 time_start: *time_start,
                 id_start: id_start.clone(),
                 time_end: last_date,