Tag - fix delayed notifications