added data-value-*of widgets