[DF-4267] improved output