My query code looks like this:

def auditQuery = queryCreator.forRevisionsOfEntity(gdc, false, true).

{{ add(AuditEntity.relatedId('preferenceDefinition').eq(definitionId))}}

{{ if (accountId != null) {}}

{{ def subQuery = auditQuery.traverseRelation('customerContext', JoinType.INNER)}}

{{ def accountIdCriterion = AuditEntity.property('accountId').eq(accountId)}}

{{ AuditCriterion filterCriterion}}

{{ if (includeDefaults) {}}

{{ filterCriterion = AuditEntity.or(accountIdCriterion, AuditEntity.property('accountId').isNull())}}

{{ } else {}}

{{ filterCriterion = accountIdCriterion}}

{{ }}}

{{ subQuery.add(filterCriterion)}}

{{ }}}