Improved list_datasets