Enforce tag fields are uppercase on retagging

Previously this was enforced, but when certain optimizations
were done,  this was lost in translation