fix make_tag_safe