fixed problem with data source sorting