Adding "data-description" attribute support 2/2

Changes needed to support an additional "data-description" attribute.