refactored partner search