Fix data value being ignored in ID if DATA-VALUE is not set.