fix tags and vendor