fix event query per device