Fixes issues with collection links