Refactor search results and add scan&scroll support