Datasource improvements

datasource name search works with paging