Work on bug #5989.  It now fills in some of the tags.