Search refactored with pagination , no tests