Tweaked semantics of Query Event classes