I think that this change is really necessary if you want to keep the data objective.
You made a wise decisión.
I would love to help but I am not a technical person that could help with the code.

Kind regards!