[#32158] Type ids all saving as 0 in map table. Fix #2124