adding events still doesn't work, fixed kind of queries
after merge, add event still doesn't work