Fix Tag values

[Mattia Manzati]

Tag values were populated by using the effect codemod, needs to be fixed

[Maxwell Brown]

I can tackle this @mattiamanzati :)

[Mattia Manzati]

Sure feel free! :)