Fix storage vendor/model collection