Yeah, I've left the event one untouched. I wanted to get this one reviewed and merged first, then we can adapt this for events. I've looked at the event query code, and I think it'll be just a few lines of changes to make that happen!