Fix null values for Clear and Archive