implemented DataSource.find more efficiently