fixed issues with empty data sources