make pagination partial more resilient