data source selection fixes