Fix the related logic of tag structure change in client codes.