Fix Query Scope in Events