Change over to date and then collection id
Merge branch 'change-archive-format'