Extended QueryEvent (take 2)