Use map/flatten instead of collect_concat