Minor improvements to archive selection