collection and model linking fix