some reordering and fix matching in predicates_and_tags_to_str