Improve third data alert management