Fix #2351 & cleanup AddToCollectionList component
#2353
Merged
AddToCollectionList component
#2353