Bug fix on alerts + comments