Add tag rewriting