Fix CQL search