fix broken tag functionallity