fixup logic for tags that did not get migrated correctly