CQL: fix extra terms in wrong order