Added capitalization to tag creator string
Added grouping by entity name