convert to strict cql operators
Merge branch 'feature/1390-strict_cql_feature' into develop