DATACASS-145: getting closer in spring-cql