fixes to new dataprovider