Fixes to Archive list