fixed parsing of predicates