code review changes to make sure dsid index is set.