Added wrap attribute to wrap sub-entries in a tag.