Fix to collection tags code to handle ampersands in type and vendor names.