reworking event queries to handle lazy loading