Fix re-attach pickup existing tags