hotfix pagination for production