Fixed up EventQuery to use correct types