Changes to data source

added some data source filters