Fixed query to find events, added comments