BZ-9406 alert improvements