issues with cql-rb fixed