Revert "Revert "Convert boolean translations to strict cql""

This reverts commit 72bf5ad09f1c06c64d89d7a0c6b64714074b99a3.