diff --git a/src/logic.js b/src/logic.js
index 8ff6698..b72eac7 100644
--- a/src/logic.js
+++ b/src/logic.js
@@ -80,10 +80,7 @@ const get_past_events_from_page = pathOr(
 );
 
 const to_unique_events = (acc, current) => {
-  return [
-    ...acc.filter((event) => event.event_id !== current.event_id),
-    current,
-  ];
+  return [...acc.filter((event) => event.id !== current.id), current];
 };
 
 const get_city_name = (event) =>
@@ -113,15 +110,13 @@ const map_event = ({ node: event }) => {
   const host = get_event_host(event);
   const canceled = pathOr(false, ['is_canceled'], event);
   return {
-    date: event.time_range,
+    canceled,
+    host: host,
+    id: event.id,
+    location: city,
     name: event.name,
-    event_id: event.id,
     ticket_url,
-    canceled,
-    location: {
-      host: host,
-      location: city,
-    },
+    date: event.time_range,
   };
 };