Better formatting of matching tags