Turns out, separate tags are better...

Also, adding some starting points for discussion about that replacement strategy.
In case you need more direction...