switched first event to query system