fixing elementSet and TablePredicate