reworked composition for better testability. MemberQueryService still needs to be correctly refactored.