Alerts ordering fix