Fix tag,list includes fields