Revert "Revert "convert cql operators to contants""

This reverts commit 7e652cd60a93d4b9aaf146ff1a08e4a261154c9f.