Fix: Pagination Generic issue