I think using OptAddress for TARGET could save this normalization effort