allow multiple values in rr:class, rr:predicate, bugfixing in filling-in templates