alerts improvements