data source screen fixes