fix to put query name to show where output event are from