Expand activity, use arrays for has_data and errors