fixes to CQL filter composition