Added filtering and sorting to the data sources