Also return a single element list when querying current dataset.