Tweak tag positioning, add code missed in merge.