[CORE] Final change on pagination

2 jobs for core in 9 minutes and 10 seconds (queued for 10 seconds)