fix CQL queries