Improve pagination actions