Merged organization and group legend (the same thing in CKAN, apparently).
Also added some more attributes.