Move tag fixup to object_validator