[TR, PO] {other} fixed bugs with notifications