Feature/summaries arranged by type closes item:388