Remaked predicate tree build