#5 Fixing Sorting and Searching when using new DataSource