REPORT-685:  Expand CompositionCohortDefinitions to other types of Queries. Fix to bug discovered when creating these via the User Interface.