TJ/JJ: singleQuery with ComposedQuery.
JJ/TJ: removed joinQueries from interface.