Fixed a bug where the new single query code was not considering descendant trellises for references.