diff --git a/src/logic.js b/src/logic.js
index b72eac7..01857be 100644
--- a/src/logic.js
+++ b/src/logic.js
@@ -69,25 +69,23 @@ const parse_args = (args) => {
   };
 };
 
-const get_upcoming_events_from_page = pathOr(
-  null,
-  'data.page.upcoming_events'.split('.'),
-);
+const get_upcoming_events_from_page = pathOr(null, [
+  'data',
+  'page',
+  'upcoming_events',
+]);
 
-const get_past_events_from_page = pathOr(
-  null,
-  'data.page.past_events'.split('.'),
-);
+const get_past_events_from_page = pathOr(null, ['data', 'page', 'past_events']);
 
 const to_unique_events = (acc, current) => {
   return [...acc.filter((event) => event.id !== current.id), current];
 };
 
 const get_city_name = (event) =>
-  pathOr('', 'event_place.city.contextual_name'.split('.'), event);
+  pathOr('', ['event_place', 'city', 'contextual_name'], event);
 
 const get_event_host = (event) =>
-  pathOr('', 'event_place.contextual_name'.split('.'), event);
+  pathOr('', ['event_place', 'contextual_name'], event);
 
 const read_previous_events = (path) => {
   if (path !== null) {