Multiple enhancements in alert handling