diff --git a/src/main/java/st/orm/demo/imdb/service/BrowseService.java b/src/main/java/st/orm/demo/imdb/service/BrowseService.java
index 09e762a..a3d7204 100644
--- a/src/main/java/st/orm/demo/imdb/service/BrowseService.java
+++ b/src/main/java/st/orm/demo/imdb/service/BrowseService.java
@@ -62,7 +62,7 @@ public Window<MovieSummary> scrollGenre(String genreName, String cursor) {
                 return null;
             }
             Scrollable<MovieSummary> scrollable = cursor != null
-                    ? Scrollable.fromCursor(MovieSummary_.id, cursor)
+                    ? Scrollable.of(MovieSummary_.id, PAGE_SIZE).from(cursor)
                     : Scrollable.of(MovieSummary_.id, PAGE_SIZE);
             return movieSummaryRepository.scrollByGenre(genre, scrollable);
             });
diff --git a/src/main/java/st/orm/demo/imdb/service/SearchService.java b/src/main/java/st/orm/demo/imdb/service/SearchService.java
index 86a4990..c6b5b8a 100644
--- a/src/main/java/st/orm/demo/imdb/service/SearchService.java
+++ b/src/main/java/st/orm/demo/imdb/service/SearchService.java
@@ -52,7 +52,7 @@ public SearchResults search(String query) {
      */
     public Window<MovieSummary> scrollMovies(String query, String cursor) {
         Scrollable<MovieSummary> scrollable = cursor != null
-                ? Scrollable.fromCursor(MovieSummary_.id, cursor)
+                ? Scrollable.of(MovieSummary_.id, MOVIE_PAGE_SIZE).from(cursor)
                 : Scrollable.of(MovieSummary_.id, MOVIE_PAGE_SIZE);
         return movieSummaryRepository.searchByTitle(query, scrollable);
     }
@@ -60,7 +60,7 @@ public Window<MovieSummary> scrollMovies(String query, String cursor) {
     /** The next window of person results — same cursor contract as {@link #scrollMovies}. */
     public Window<PersonSummary> scrollPersons(String query, String cursor) {
         Scrollable<PersonSummary> scrollable = cursor != null
-                ? Scrollable.fromCursor(PersonSummary_.id, cursor)
+                ? Scrollable.of(PersonSummary_.id, PERSON_PAGE_SIZE).from(cursor)
                 : Scrollable.of(PersonSummary_.id, PERSON_PAGE_SIZE);
         return personSummaryRepository.searchByName(query, scrollable);
     }
diff --git a/src/test/java/st/orm/demo/imdb/repository/MovieSummaryRepositoryTest.java b/src/test/java/st/orm/demo/imdb/repository/MovieSummaryRepositoryTest.java
index b504f3e..29a3b6c 100644
--- a/src/test/java/st/orm/demo/imdb/repository/MovieSummaryRepositoryTest.java
+++ b/src/test/java/st/orm/demo/imdb/repository/MovieSummaryRepositoryTest.java
@@ -48,7 +48,7 @@ void searchByTitleScrollsThroughWindowsWithACursor(ORMTemplate orm, SqlCapture c
         assertNotNull(cursor);
 
         Window<MovieSummary> secondWindow = capture.execute(() ->
-                movieSummaryRepository.searchByTitle("matrix", Scrollable.fromCursor(MovieSummary_.id, cursor)));
+                movieSummaryRepository.searchByTitle("matrix", Scrollable.of(MovieSummary_.id, 1).from(cursor)));
         TestSupport.printStatements(capture, "searchByTitle-cursor");
         assertEquals(1, secondWindow.content().size());
         assertFalse(firstWindow.content().get(0).id().equals(secondWindow.content().get(0).id()));
@@ -100,7 +100,7 @@ void scrollByGenreJoinsTheJunctionTableAndScrollsOnTheMovieKey(ORMTemplate orm,
         assertTrue(firstWindow.hasNext());
 
         Window<MovieSummary> secondWindow = movieSummaryRepository.scrollByGenre(
-                drama, Scrollable.fromCursor(MovieSummary_.id, firstWindow.nextCursor()));
+                drama, Scrollable.of(MovieSummary_.id, 2).from(firstWindow.nextCursor()));
         // Three drama movies in total: 2 in the first window, 1 in the second.
         assertEquals(1, secondWindow.content().size());
     }