added no tracker events handling