Improve tags.