Refactor search results infinite scroll