Fix invalid covers tags and cleanup

Change-Id: I6a92e64955147eec0067e9bfbf6035bca7b8bc75
Merge "Fix invalid covers tags and cleanup"