changed to use DataValue (the one stored in db) instead of Value