Added data-value handling to HTML API