[bugfix] map, list and enum is wrapped by entity