Updated for archived comments handling.