Fixed issue: Fix broken pagination offset