Extract MemberSearch and clean code