Fixing tags when archiving