Topic Tag: fixing issues