fix collections
Fix collections tagz
Merge with r1411