Encapsulate query logic, factor out org/person specific code, use KBPQuery objects for input