Fix and add group and covers tags

Change-Id: I9c234d3bd34f9a7951904d9f94c27875bb684161
Merge "Fix and add group and covers tags"