BS-8827, improve pagination to meet others widget pagination scheme.