notification fixes to limit by user.