Updated tags to accomodate collection tag.