Restored isPartOf, order by, added comp. predicate