Fix pagination
Fix paginagation when fetching resource