try to provide subset for automatic alerts
minor cleanup