fixed tag remove handling