[#48859859 #42112499] add primary_type as separate field