BZ-9560: changes to alerts