use the new corpus selection subquery also in matrix