Pretty substantial reworking of the way queries are built to allow for qualifiers on combo relations