Added collection url to collection
Added link to collection if collection url is present
Fix law of demeter