Bug fixing and changed alerts visualization logic