Finish dealing with events

From #6359.
Can we leave the limit in place, we will still have increasingly more results that we need to slice as we advance in pages but page 1-2 will be as performant as they were before.  We don't need the full set if I understand this correctly but instead just from 0 - (the end of the current page).