Fix data provider with sorted data