Features and bug fixing for alert functionality