Restored proper search functionality that auto-paginates