fix tag mapping