* CustomDataSource is now a IDynamicDataSource.
* added some filtering.