Add query-name support for Composite Commands also.