More fixes for tag changing problem