Fix issue when moving tags