[#82470094] basket fixes