[#85] smarter alerts