Pagination component bugs fix