More improvements to archive list