inclusion of types from parameter_editor and better testing for predicates