[-] CORE: Fix Pagination problem