removed adding type and id for subgeometries in type 4,5 and 6