[Data] Improve data for TOI