fixed handleListDataSources