Restored tagging functionality after migration