BZ-9406 alert improvements
BZ-UX: improvements