REPORT-656
Deprecate and remove need for DataSetQueryService