Fix CQL to CCL conversion for multiple terms