diff --git a/src/data/streams/aware_postgresql/container.R b/src/data/streams/aware_postgresql/container.R
index 8f4c6a06..f9fe8774 100644
--- a/src/data/streams/aware_postgresql/container.R
+++ b/src/data/streams/aware_postgresql/container.R
@@ -144,7 +144,7 @@ pull_participants_ids <- function(stream_parameters, usernames, participants_con
 pull_participants_device_ids <- function(stream_parameters, participants_ids, device_id_container) {
   dbEngine <- get_db_engine(stream_parameters$DATABASE_GROUP)
 
-  query_device_id <- tbl(dbEngine, device_id_container) %>% 
+  query_device_id <- tbl(dbEngine, device_id_container) %>%
     filter(participant_id %in% !!participants_ids) %>% 
     group_by(participant_id) %>% 
     distinct(device_id, .keep_all = FALSE)
@@ -174,7 +174,7 @@ pull_participants_start_end_dates <- function(stream_parameters, participants_id
 
   query_timestamps <- tbl(dbEngine, start_end_date_container) %>% 
     filter(
-      participant_id %in% !!participant_data$id,
+      participant_id %in% !!participants_ids,
       double_esm_user_answer_timestamp > 0
     ) %>% 
     group_by(participant_id) %>% 
@@ -189,7 +189,7 @@ pull_participants_start_end_dates <- function(stream_parameters, participants_id
   start_end_timestamps <- query_timestamps %>% collect()
   
   if(nrow(start_end_timestamps) == 0)
-    warning(paste("We could not find datetimes for requested participant IDs (", participants_ids,  ") in ", device_id_container))
+    warning(paste("We could not find datetimes for requested participant IDs (", participants_ids,  ") in ", start_end_date_container))
 
   start_end_times <- start_end_timestamps %>% 
     mutate(