Merge "Revert "Limit searches at 500 per page""