TJ/JJ: added some features to ComposedQuery