Fixed tagType context not saving