Replace getValueIdForValue by getValueId(value, create)