:smile: improve pagination