Add new flex report grouping level

added combined funding source and subsource
Clean up on some flex report partials