Archive tab fixes