Transform predicates to be from comparables an not depending sql
Adapt comparable items