update search feature to strict cql