Implement proper search pagination