improvements for alert handling