Update events query

[jmelot]

We can probably save some cost by updating the query (and probably downstream queries) to use an old data cache, and we should avoid having to manually edit the query to keep it up to date