Add correct logic for mandatory announcement list