Added the ability to query event by id