US1434: Convert strict cql to double-quotes