Fixed remove tags issue