fixed datastream id issues