Introduced SubqueryExpression.SUBQUERY_TAG to replace hardcoding in two places