Do you think the flat fields should be included in ALL rows or is it OK to have them only in some rows?

I think it would be better to include them in all rows. The ones missing here are the ones with custom 'group_by': https://github.com/dimagi/fluff/blob/master/fluff/__init__.py#L580-580