1. OK. 2. OK.
I’m confused because I don’t know why, until now, I’ve corresponded tanha to mano sankhara and upadana to vaci and kaya sankhara in my mind. I guess the second one you mentioned might have influenced me. It is too subtle. Or it seems that it might have been because the time interval between the revised content on the eng site and the reflecting changed item on the Korean website is long. Anyway, my problem is solved.
–
I checked the chart in Icchā (Cravings) Lead to Upādāna and to Eventual Suffering.
It clearly counts all three abhisankhara as upadana.