fixed different query events