rewriting the way cql are generated to accomodate soil characterization
and new layer cql preserve