PIM-1584 Fixe last Model/Category remains